small changes
Merge branch 'dev' into dev_LA
some kind of fix
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/MenuState.cpp