Merge
Merge branch 'master' of github.com:tlein/GameJam2013

Conflicts:
	src/org/mosque/entities/GridEntity.java
	src/org/mosque/entities/Player.java