XMLController fixes
Merge branch 'master' of https://github.com/KevinEdelmann/HideOut.git