Merge branch 'master' into feature/organization-in-partner-block

app/assets/images/extranet/avatar.png

app/assets/stylesheets/application.sass

app/assets/stylesheets/application/layout.sass

app/assets/stylesheets/application/variables.sass

app/controllers/admin/application_controller.rb

app/controllers/admin/education/cohorts_controller.rb

app/controllers/admin/university/people_controller.rb

app/controllers/admin/university/person/alumni_controller.rb

...ers/admin/university/person/alumnus/imports_controller.rb

app/controllers/api/application_controller.rb

app/controllers/api/dashboard_controller.rb

app/controllers/api/lheo_controller.rb

app/controllers/application_controller.rb

app/controllers/extranet/academic_years_controller.rb

app/controllers/extranet/application_controller.rb

app/controllers/extranet/cohorts_controller.rb

app/controllers/extranet/home_controller.rb

app/controllers/extranet/organizations_controller.rb

app/controllers/extranet/persons_controller.rb

app/helpers/application_helper.rb