merge

app/assets/javascripts/admin/appstack.js

app/assets/javascripts/admin/plugins/codemirror.js

app/assets/javascripts/admin/pure.js

app/assets/stylesheets/admin/appstack.sass

app/assets/stylesheets/admin/commons/codemirror.sass

app/assets/stylesheets/admin/pure.sass

app/controllers/extranet/pages_controller.rb

app/controllers/extranet/style_controller.rb

app/models/communication/extranet.rb

app/models/communication/extranet/document.rb

app/models/communication/extranet/with_connections.rb

...iews/admin/communication/blocks/components/_edit.html.erb

...admin/communication/blocks/components/code/_edit.html.erb

app/views/admin/communication/blocks/edit.html.erb

app/views/admin/communication/extranets/_form.html.erb

app/views/admin/university/organizations/static.html.erb

app/views/extranet/layouts/devise.html.erb

db/schema.rb

package.json

test/fixtures/communication/extranet/documents.yml