merge

app/assets/javascripts/admin/plugins/summernote.js

app/helpers/admin/application_helper.rb

app/models/ability.rb

app/models/communication/website/index_page.rb

app/models/communication/website/post.rb

app/views/admin/communication/website/posts/show.html.erb

...dmin/education/program/roles/_involvement_fields.html.erb

...ews/admin/education/programs/_involvement_fields.html.erb

...admin/education/school/roles/_involvement_fields.html.erb

...ews/admin/education/teachers/_involvement_fields.html.erb

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

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

app/views/admin/university/people/_form.html.erb

config/locales/university/fr.yml