Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/AttackService.java
	RPG/src/com/jreale4/RPG/client/AttackServiceAsync.java
	RPG/src/com/jreale4/RPG/server/AttackServiceImpl.java
Merge remote-tracking branch 'jreale4/master'
Merge remote-tracking branch 'Ryan_Hammett/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