Mining colony created, missing active elements
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/MapSelectState.cpp
	SpaceSumo/MenuState.cpp
	SpaceSumo/res/ResourceList.xoxo