jag minns inte, antagligen ingenting märkvärdigt
Merge branch 'dev' into dev_AO

Conflicts:
	SpaceSumo/res/conf/spaceman.cfg
Merge branch 'dev' into dev_AO
 Added B2Body initiator struct
Fixed the constructor for spaceman, and some B2Body problems
EntityFactory update + LHydrogen started
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/entityFactory.cpp
	SpaceSumo/entityFactory.h
Added state handling
merge dev_NL into dev