Renamed level to gameWorld in entity.
Now the "player collision"-sfx is played in the view instead of the
controller.
Merge branch 'master' of https://github.com/LinneaAndersson/SecondHand

Conflicts:
	Twist/src/com/secondhand/model/Entity.java