Optimize views
gjslint general
gjslint models
gjslint collections
gjslint templates
gjslint views
gjslint main
gjslint
Merge branch 'master' into requirejs

Conflicts:
	app/static/js/collections.js
	app/static/js/general.js
	app/static/js/main.js
	app/static/js/models.js
	app/static/js/templates.js
	app/static/js/views.js
	app/static/js/views.min.js