nothing really
Merge branch 'master' into campaign-overview-ui

Conflicts:
	app/views/contracts/_contract.html.slim