cleanup
Merge branch 'Gameplay' of github.com:Daveiac/AndroidGameProject into Gameplay

Conflicts:
	game/src/no/ntnu/folk/game/gameplay/layers/KeyPadLayer.java