No commmit.
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/.gwt/.gwt-log
If and only if login is successful, receives Stack Overflow error.

Updates to BattleView layout and button code.