Merge branch 'master' into secret-vote

Conflicts:
	static/stylesheets/site.css