cleanup
Merge branch 'dev' of https://github.com/Ryxali/SpaceSumo into dev
Added consts.h
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/MenuState.cpp