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

Gemfile

Gemfile.lock

app/assets/javascripts/admin/commons/batch-selectable.js

app/assets/stylesheets/application.sass

app/assets/stylesheets/application/faceted_search.sass

app/controllers/admin/application_controller.rb

app/controllers/admin/communication/extranets_controller.rb

...ntrollers/admin/communication/website/posts_controller.rb

app/controllers/admin/university/organizations_controller.rb

app/controllers/admin/university/people_controller.rb

app/controllers/admin/users_controller.rb

app/controllers/extranet/home_controller.rb

app/controllers/extranet/organizations_controller.rb

app/controllers/extranet/persons_controller.rb

app/helpers/admin/application_helper.rb

app/models/ability.rb

app/models/communication/block/template.rb

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

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

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