Angular velocity calculations may have bugs, linear velocity needs minor addition
Merge remote-tracking branch 'origin/farhad_collision'

Conflicts:
	src/server/game/PhysicsWorld.cpp
	src/server/game/S_Asteroid.cpp
	src/server/game/S_Resource.cpp
	src/server/game/S_Ship.cpp
	src/server/game/ServerEntity.cpp
	src/server/game/ServerEntity.h