Fix
Merge branch 'master' of https://github.com/rockztar/NewRPGAndroidGame

Conflicts:
	src/combat/Battle.java
	src/units/Enemy.java
	src/weapons/Axe.java
	src/weapons/DevWeapon.java
	src/weapons/Staff.java