Added onCollision() to entities, added block pickup and added some methods to Location class
Merge branch 'sander'