merge

Gemfile

Gemfile.lock

app/assets/stylesheets/admin/pure/navigation.sass

app/controllers/admin/application_controller.rb

...controllers/admin/application_controller/with_features.rb

...lers/admin/communication/extranets/contacts_controller.rb

...mmunication/extranets/documents/application_controller.rb

...ommunication/extranets/documents/categories_controller.rb

...min/communication/extranets/documents/kinds_controller.rb

...ers/admin/communication/extranets/documents_controller.rb

...trollers/admin/communication/websites/posts_controller.rb

app/controllers/admin/dashboard_controller.rb

app/controllers/extranet/library/documents_controller.rb

app/controllers/server/universities_controller.rb

app/helpers/admin/application_helper.rb

app/models/ability.rb

app/models/communication/extranet.rb

app/models/communication/extranet/document.rb

app/models/communication/extranet/document/category.rb

app/models/communication/extranet/document/facets.rb