Merge branch 'develop' into feature/add_events_crud_and_create_event_page

Conflicts:
	Gemfile
	app/assets/stylesheets/custom.css
	app/models/user.rb
	app/views/layouts/web/shared/_navigation.html.haml
	config/routes.rb
fix bug in web/events/new view
fix bugs
fix users count
Merge branch 'develop' into staging
Merge branch 'feature/add_events_crud_and_create_event_page' into staging

Conflicts:
	Gemfile
	app/assets/stylesheets/custom.css
	app/models/user.rb
	app/views/layouts/web/shared/_navigation.html.haml
	config/routes.rb