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

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

app/models/communication/block/template/file.rb

app/models/education/academic_year.rb

app/models/education/cohort.rb

app/models/university/person/with_education.rb

app/services/filters/admin/communication/extranets.rb

app/services/filters/admin/communication/website/posts.rb

app/services/filters/admin/communication/websites.rb

app/services/filters/admin/education/programs.rb

app/services/filters/admin/education/schools.rb

app/services/filters/admin/education/teachers.rb

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

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

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

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

app/services/filters/admin/users.rb

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

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

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

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