Changed a few files with collision and collision manager
ops
Merge branch 'master' of https://github.com/flanr/Frogger

Conflicts:
	Frogger/Configuration
	Frogger/Configuration.backup