Unify js code
Merge branch 'master' into marionette

Conflicts:
	app/static/js/main.min.js