Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/AttackService.java
Merge remote-tracking branch 'jreale4/master' *nope*
Last stable commit (broken BattleView).
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/BattleView.java
	RPG/src/com/jreale4/RPG/client/MapView.java
Merge remote-tracking branch 'jreale4/master'
Removed warning errors.
Nothing.
Merge remote-tracking branch 'jreale4/master'
Began implementation of Progress/Health bar. Updated Attack button.
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPGPersistence/src/com/jreale4/RPG/server/model/persist/FakeDatabase.java
Ctrl+I on BattleView.
Merge remote-tracking branch 'Ryan_Hammett/master'
update