Merge branch 'master' into requirejs

Conflicts:
	app/static/js/collections.js
	app/static/js/collections.min.js
	app/static/js/models.js
	app/static/js/models.min.js
	app/static/js/views.js
	app/static/js/views.min.js