bugfix
fixes for vote results
fix back button on proposals editing
bugfix
Merge branch 'master' into version_4_0

Conflicts:
	app/models/proposal.rb