Merge branch 'develop' into feature/add_events_crud_and_create_event_page

Conflicts:
	app/assets/stylesheets/custom/_nav.scss
	app/views/layouts/web/shared/_navigation.html.haml
add flash and active menu item
Merge branch 'feature/add_events_crud_and_create_event_page' into staging

Conflicts:
	app/assets/stylesheets/custom/_nav.scss
	app/views/layouts/web/shared/_navigation.html.haml