Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/AttackService.java
User now gets sent through Views
Merge remote-tracking branch 'jreale4/master' *nope*