Fully Merged Commit 4/11 4:38
Merge remote-tracking branch 'Ryan_Hammett/master'
stuff
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/war/rpg/rpg.nocache.js