Merge branch 'master' of https://github.com/max-konin/Kogdata

Conflicts:
	app/views/office/_sidebar_box.html.haml