Fixed crash
Merge remote-tracking branch 'origin/master' into JoeMaster

Conflicts:
	DynamoEngine/src/gameDemo/Game.java