menu upgrade
Merge branch 'dev' into dev_LA
SpaceMan improvements before test
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/FreezeBolt.cpp
	SpaceSumo/Freezer.h
merged