Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/AttackService.java
	RPG/src/com/jreale4/RPG/server/AttackServiceImpl.java
	RPGControllers/src/com/jreale4/RPG/server/controllers/BattleController.java
Stable commit.

BattleView runs through a one-sided battle, enemy takes damage via
slash(soon fira).

Database in recration from fake to real.
Editing design view.
Merge remote-tracking branch 'jreale4/master' (NOPE)
Merge remote-tracking branch 'jreale4/master'
Reset repository.
Reset & rebased on jreale branch.
Merge branch 'master' of git@github.com:Larke12/Team_Assignment-RPG.git

Conflicts:
	RPGModelClasses/src/com/jreale4/RPG/shared/Hero.java
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/BattleView.java
Merge remote-tracking branch 'jreale4/master'
Test commit.
Merge remote-tracking branch 'Ryan_Hammett/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