Small Bugfixes
Merge branch 'master' of https://github.com/NDependend/GameCreator.git