delete trash link from first event form
fix translates
Merge branch 'feature/141-more-sponsors' into develop
add ajax votings
Merge branch 'develop' into feature/add_events_crud_and_create_event_page

Conflicts:
	app/models/user.rb
Merge branch 'feature/add_events_crud_and_create_event_page' into staging

Conflicts:
	app/models/user.rb