update commit
Merge branch 'master' of https://github.com/Turgure/Simulation

Conflicts:
	Simulation/BattleScene.cpp