some fixes
i18n
version
fix on results
another fix
fix for colors
some i18n fixes
merge
Merge branch 'master' into version_4_0

Conflicts:
	app/views/proposals/edit.html.erb
	config/locales/contents.en.yml
	config/locales/contents/contents.it-IT.yml
	db/schema.rb