Active weapon on player
Merge branch 'master' of https://github.com/kglendenning/PocketInvaders

Conflicts:
	GameApp/build/classes/gameapp/GameField.class