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

Conflicts:
	src/combat/Battle.java
Merge branch 'master' of https://github.com/rockztar/NewRPGAndroidGame

Conflicts:
	src/combat/Battle.java