Collision now react to terrain and other entities differently...for the player anyway
Merged master into my branch
Fixed the Enum file merge confict I had - trev
Merge branch 'master'