some fixes
bugfix
old icons
patch
quick fix
Merge branch 'master' into version_1_9

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