Merge remote-tracking branch 'origin/master' into AH-294_Physics_Integration_Test

Conflicts:
	BoostIntegrationTest/BoostIntegrationTest.vcxproj.filters

Reworked the collision class