Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/AttackService.java
	RPG/src/com/jreale4/RPG/client/BattleView.java
	RPG/src/com/jreale4/RPG/server/AttackServiceImpl.java
	RPGControllers/src/com/jreale4/RPG/server/controllers/BattleController.java
Fixed all merge conflicts. Up-to-date.
Working enemy attack and player health bar.
Worked on Juint test HeroTest2