Govnocommit
Govnocommit2
add messages and govnocode
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/home.css.scss
	app/controllers/events_controller.rb
	app/models/user.rb
	app/views/application/_header.html.haml
	app/views/calendar/index.html.haml
	app/views/layouts/application.html.haml
	config/routes.rb
messages page and replying messages ability added in personal page
Merge remote-tracking branch 'origin/master'