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

Gemfile.lock

app/assets/stylesheets/admin/appstack.sass

app/assets/stylesheets/commons/_summernote.sass

...controllers/admin/university/alumni/cohorts_controller.rb

...rollers/admin/university/alumni/experiences_controller.rb

app/controllers/users/confirmations_controller.rb

app/helpers/admin/application_helper.rb

app/models/ability.rb

app/models/communication/website.rb

app/models/communication/website/category.rb

app/models/communication/website/page/with_path.rb

app/models/communication/website/post.rb

app/models/communication/website/with_dependencies.rb

app/models/education/cohort.rb

app/models/education/diploma.rb

app/models/education/program.rb

app/models/education/school.rb

app/models/education/school/with_alumni.rb

app/models/research/journal.rb

app/models/university/organization.rb