Not working upgrade GUI

Still needs fixing!
Eh stuff ;P
Merge remote-tracking branch 'origin/master'

Conflicts:
	FacsColab/src/uf/Classes/Abilities/Ability.java
	FacsColab/src/uf/Classes/Abilities/Berserker/BerserkerEnrage.java
	FacsColab/src/uf/Classes/Abilities/Bomberman/BombermanDetonate.java
	FacsColab/src/uf/Classes/Abilities/Bomberman/BombermanFireball.java
	FacsColab/src/uf/Classes/Abilities/Demon/DemonHotAir.java
	FacsColab/src/uf/Classes/Abilities/Demon/DemonSummoner.java

	FacsColab/src/uf/Classes/Abilities/Dreadnought/DreadnoughtInvulnerability.java

	FacsColab/src/uf/Classes/Abilities/Dreadnought/DreadnoughtLastStand.java
	FacsColab/src/uf/Classes/Abilities/Marksman/MarksmanEagleEye.java
	FacsColab/src/uf/Classes/Abilities/Marksman/MarksmanSprint.java

	FacsColab/src/uf/Classes/Abilities/WitchDoctor/WitchDoctorPotionMaster.java
	FacsColab/src/uf/Classes/BerserkerClass.java
	FacsColab/src/uf/Classes/Upgrades/Berserker/Lightweight.java
	FacsColab/src/uf/Classes/Upgrades/Berserker/LumberJack.java
	FacsColab/src/uf/Classes/Upgrades/Berserker/SliceNDice.java
	FacsColab/src/uf/Classes/Upgrades/Bomberman/Fueler.java
	FacsColab/src/uf/Classes/Upgrades/Bomberman/Pyrotechnic.java
	FacsColab/src/uf/Classes/Upgrades/Bomberman/Swag.java
	FacsColab/src/uf/Classes/Upgrades/Dreadnought/Ironhide.java
	FacsColab/src/uf/Classes/Upgrades/Dreadnought/SecondDinner.java
	FacsColab/src/uf/Classes/Upgrades/Marksman/Bullseye.java
	FacsColab/src/uf/Classes/Upgrades/Marksman/Sharpshooter.java
	FacsColab/src/uf/Classes/Upgrades/Marksman/StrongArm.java
	FacsColab/src/uf/Classes/Upgrades/Upgrade.java
	FacsColab/src/uf/Classes/Upgrades/WitchDoctor/Alchemist.java
	FacsColab/src/uf/Classes/Upgrades/WitchDoctor/Javelin.java
	FacsColab/src/uf/Main.java
	FacsColab/src/uf/PlayerUtil/UpgradeGUI.java
	FacsColab/src/uf/ToolTips/ToolTips.java
Merge........ finally