up
Merge branch 'master' of github.com:IEG-MiniGame-Heros/SYSGame

Conflicts:
	Classes/GameHelper.cpp