whitespace fixes
convert deneb, pumpkinseed and molamola to new cargo slot defs, and fix lunarshuttle
Merge branch 'master' into new-equipment

Conflicts:
	src/ShipType.cpp
	src/WorldView.cpp