SOOBSHENIYA ZARABOTALI!!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/office/_event_box.html.haml
	app/views/office/_sidebar_box.html.haml
	config/routes.rb
SOOBSHENIYA ZARABOTALI!!!!
SOOBSHENIYA ZARABOTALI!!!!
Merge remote-tracking branch 'origin/master'