PHYS-16 #time 1h 45m #comment Fixed collision detection so that it now actually checks all items. Fixed angular momentum calculations in merge code.  Removed some old timing code. Added some very minor constness.
Merge branch 'prevMomentumFix' into nightly

Conflicts:
	src/ShapeFiles/MyShape.h