Merge branch 'master' into simplify_folders

app/assets/javascripts/admin/university/edit.js

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

app/models/university/person/with_education.rb

app/views/admin/application/_nav.html.erb

app/views/admin/communication/websites/pages/_form.html.erb

app/views/admin/communication/websites/pages/show.html.erb

app/views/admin/communication/websites/pages/static.html.erb

app/views/admin/education/teachers/edit.html.erb

...ws/admin/university/people/alumni/_cohort_fields.html.erb

app/views/admin/university/people/alumni/_list.html.erb

...iews/admin/university/people/alumni/edit_cohorts.html.erb

app/views/admin/university/people/alumni/index.html.erb

app/views/admin/university/people/alumni/new.html.erb

app/views/admin/university/people/alumni/show.html.erb

...ews/admin/university/people/alumni/show/_cohorts.html.erb

app/views/server/universities/_form.html.erb

config/locales/en.yml

config/locales/fr.yml

config/locales/university/en.yml

config/locales/university/fr.yml