add event page
for merge
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	config/database.yml
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/models/message.rb
	config/database.yml
add new message forms and action.
Missing check for existing conversation!!!!!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/database.yml