merge 2.4
Merge branch 'version_2_4' into version_2_5
similar tags,
few css fixing,
statistics page
statistics page
block alerts on specific proposal
delayed notifications
retire as author
links in user roles panel
usability fixes
new header tooltip
show author in proposal history
remove solution when added
changed proposal header message
added i18n fallback
fix on paragraphs move
Merge branch 'version_2_4' into version_2_5

Conflicts:
	db/schema.rb
quick fix for elections
quick fix
version
new proposals model and layout
Merge branch 'master' into version_2_5
Merge branch 'version_2_5' into version_2_6
quick fix
Merge branch 'version_2_4_2' into version_2_5
Merge branch 'version_2_5' into version_2_6
something for candidates
another quick fix
Merge branch 'version_2_4_2' into version_2_5
Merge branch 'version_2_5' into version_2_6
moderator,
count proposal notifications
fix on meeting response
layout fix