Collision now corrects position, fixed ceiling collision
Merge branch 'Gameplay' of ssh://git@github.com/Daveiac/AndroidGameProject.git into Gameplay
renamed method checkPlayerCollision to correctPosition and made it take
an entity rather than a player.