Updated some Scope for that bad breath
Brought back the right boxes from the dead
Begun adding cool Setup troop stuff :D
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/js/application.js