comments and firetime changed
Merge branch 'ProjectileCollision' of github.com:gametechnology/psi-2013 into ProjectileCollision

Conflicts:
	source/Game/CollisionTestScene.cpp