ops
fixes on proposals list
warn message
Merge branch 'master' into version_1_9
Merge branch 'version_1_9' into version_2_0

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