fix line endings
Merge branch 'master' into new-equipment

Conflicts:
	src/WorldView.cpp
whitespace fixes
convert deneb, pumpkinseed and molamola to new cargo slot defs, and fix lunarshuttle
White space fixes

'cause robn isn't the only one that can :-)
clean up some obvious deprecation warnings