Ready for JS conflict
Merge remote-tracking branch 'origin/master'

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