Health powerup, improved weapon swapping
Merge branch 'master' of https://github.com/kglendenning/PocketInvaders

Conflicts:
	GameApp/build/classes/gameapp/GameField.class
	GameApp/build/classes/gameapp/Player.class
	GameApp/src/gameapp/Player.java