Merge branch 'feature/166-voices-count-changes' into develop

Conflicts:
	app/views/web/events/index.html.haml
add text to accounts
Merge branch 'develop' into staging

Conflicts:
	app/views/web/accounts/_form.html.haml