Update
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/BattleView.java