Attempted timer fix? Added states
Merge remote-tracking branch 'origin/master' into Gamestates-and-such
Delta time now correct and sent to objectmanager
Merge

Conflicts:
	BO360/BO360/BO360.vcxproj
	BO360/BO360/BO360.vcxproj.filters
	BO360/BO360/BOSystem.cpp