Update balance
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/assemblr/arena06/common/data/weapon/Weapon.java