Merge branch 'develop'
Merge branch 'maps'
added easy escape map
Merge branch 'master' of ssh://cwick.synology.me:822/volume1/gitrepo/Mencus into mapeditor
updated map
removed unused resources
Merge branch 'develop'
adjusted end of escape map
Merge branch 'maps'
Merge branch 'maps' into develop
updated global build defines for android, no map editor
Merge branch 'master' into develop
fixed missed path to black.png and changed main resource group to PreloadGame
Merge branch 'master' into develop