Merge remote-tracking branch 'origin/master' into Alen's-Branch

Conflicts:
	src/com/testgame/scene/SetupScene.java
Merge Again