windows changes
Merge branch 'dev' of github.com:isthisgood/xmlgui into dev
Merge branch 'dev' of github.com:isthisgood/xmlgui into dev
marzeck changes