minor changes
Merge branch 'dev' into dev_LA
small changes
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/Game.cpp