Merge branch 'feature/correct_main_page-51' into develop
Merge branch 'feature/partner_url-54' into develop

Conflicts:
	app/views/layouts/web/shared/_partners.html.haml
Merge branch 'feature/add_photo_for_instructors-53' into develop

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/web/instructors_controller.rb
Merge branch 'feature/email_for_study_requests-55' into develop

Conflicts:
	db/schema.rb
Merge branch 'feature/add_classroom-57' into develop

Conflicts:
	db/schema.rb
fixes category
fixes union page
Merge branch 'feature/edit_union_page-60' into staging

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/web/instructors_controller.rb
	app/views/layouts/web/shared/_partners.html.haml
	db/schema.rb