i18n
Merge branch 'version_1_9' into version_2_0
interest border i18n
odio
some fixes
bugfix
old icons
patch
quick fix
Merge branch 'master' into version_1_9

Conflicts:
	app/views/proposals/_reply.html.erb
Merge branch 'version_1_9' into version_2_0

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