After code review

Fixed some syntax and changed some minor tweaks
Merge remote-tracking branch 'origin/templating' into templating

Conflicts:
	js/application.js
	js/models/rack.js
	js/views/rackStageView.js
	js/views/racksView.js
	js/views/topListItemView.js
	js/views/topListPanelView.js