box2d update
GameData, entityFactory2
Merge branch 'dev_LA' of https://github.com/Ryxali/SpaceSumo into dev_LA

Conflicts:
	SpaceSumo/SpaceManImp.cpp
	SpaceSumo/SpaceSumo.vcxproj
	SpaceSumo/res/conf/spaceman.cfg
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/SpaceSumo.vcxproj