Merge branch 'feature/add_events_crud_and_create_event_page' into staging
Merge branch 'develop' into staging
Merge branch 'feature/add_events_crud_and_create_event_page' into staging
Merge branch 'develop' into staging
Merge branch 'feature/110_change_private_office' into staging

Conflicts:
	app/views/web/accounts/_form.html.haml
add fields to accounts/edit form
Form imoroved.
Merge branch 'staging' of github.com:kaize/nastachku into staging
Merge branch 'feature/110_change_private_office' into staging

Conflicts:
	app/views/web/accounts/_form.html.haml
Merge branch 'feature/speakers_carousel' into staging
Merge branch 'staging' of github.com:kaize/nastachku into staging
Merge branch 'feature/add_events_crud_and_create_event_page' into staging
Merge branch 'feature/136-add-itmozg-logo' into staging
Merge branch 'feature/speakers_carousel' into staging

Conflicts:
	app/assets/stylesheets/custom/_main.scss
Return wrong merge code.
Merge branch 'feature/speakers_carousel' into staging
Merge branch 'feature/add_events_crud_and_create_event_page' into staging
Active menu items styles added.
Merge branch 'feature/142-active-classes-for-menu' into staging

Conflicts:
	app/assets/stylesheets/custom/_nav.scss
Merge branch 'feature/110_change_private_office' into staging

Conflicts:
	app/views/layouts/web/shared/_sponsors.html.haml
	config/locales/titles.ru.yml