merge

Gemfile.lock

app/controllers/admin/education/programs_controller.rb

app/controllers/admin/university/people_controller.rb

app/models/education/program.rb

app/models/university/person.rb

app/models/university/person/administrator.rb

app/models/university/person/alumnus.rb

app/models/university/person/author.rb

app/models/university/person/researcher.rb

app/models/university/person/teacher.rb

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

app/views/admin/education/programs/_form.html.erb

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

app/views/admin/education/programs/static.html.erb

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

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

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

app/views/api/dashboard/index.html.erb

app/views/api/layouts/application.html.erb

app/views/api/lheo/index.xml.erb