Also updated parser for new xml format

Action passed in in order to make X in title bar close work

It was introduced by the Open Pilot URL Factory code.

Restructured to better fit existing build structure