add events on click
Merge branch 'master' of https://github.com/max-konin/Kogdata
add events on click
Merge branch 'master' of https://github.com/max-konin/Kogdata
add events on click
add event on click
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/calendar_controller.rb
	config/database.yml