Merge remote-tracking branch 'origin/master' into havok

Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
Merge branch 'master' into havok

Conflicts:
	src/GameWorld.cpp
	src/Systems/GameStateSystem.cpp
	src/Systems/TankSteeringSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
Collisions
Merge remote-tracking branch 'origin/master' into havok

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters