Merge branch 'master' into version_1_8

Conflicts:
	app/views/proposals/_proposal_list_element.html.erb