Merge branch 'master' into dashboard-reimplementation

Conflicts:
	static/my.jobs.153-05.css
	static/my.jobs.153-12.css
	static/my.jobs.153-17.css
	templates/base.html