Merge branch 'master' of github.com:noesya/osuny

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

...controllers/admin/university/alumni/imports_controller.rb

app/controllers/admin/university/alumni_controller.rb

app/models/education/academic_year.rb

app/models/university/person/with_education.rb

app/services/filters/admin/university/alumni.rb

app/views/admin/education/academic_years/_list.html.erb

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

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

app/views/admin/university/alumni/_cohort_fields.html.erb

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

app/views/admin/university/alumni/edit_cohorts.html.erb

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

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

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

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

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

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

config/admin_navigation.rb

config/locales/education/en.yml