Extended upgrades at boss level
Merge branch 'master' into BossAlien

Conflicts:
	SpaceInvadersEPIC.jar
	SpaceInvadersEPIC/bin/spaceInvaders/Game$KeyInputHandler.class
	SpaceInvadersEPIC/bin/spaceInvaders/Game.class
	SpaceInvadersEPIC/bin/spaceInvaders/UpgradeShop.class
	SpaceInvadersEPIC/src/spaceInvaders/Game.java