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

Gemfile.lock

app/controllers/admin/communication/unsplash_controller.rb

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

app/controllers/admin/university/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/alumni.rb

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

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

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

app/services/filters/admin/users.rb

...nication/blocks/templates/call_to_action/_static.html.erb