bugfixes
Merge branch 'version_2_8' into version_3_0

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