Merge remote-tracking branch 'origin/c/feature/#81' into c/feature/#84
Merge remote-tracking branch 'origin/c/feature/#81' into c/feature/#84
show conflicting events for the user
everything is better
huhu?
 event_id -> id
Merge branch 'c/feature/#84' into c/feature/#81

Conflicts:
	db/migrate/20141208110936_create_event_suggestions.rb
	db/migrate/20141208125025_create_event_suggestions.rb
	db/migrate/20141210144902_create_event_suggestions.rb
tests should work now