main page design KD-4 work 24h
Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/assets/javascripts/Calendar/document-ready.js.coffee