Merge branch 'master' into feature/unsplash

Gemfile

Gemfile.lock

app/assets/stylesheets/admin/treeview.sass

app/controllers/users/omniauth_callbacks_controller.rb

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

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

app/models/communication/website/index_page.rb

app/models/communication/website/menu/item.rb

app/models/communication/website/page.rb

app/models/communication/website/with_special_pages.rb

app/models/university/with_sso.rb

app/models/user.rb

app/models/user/with_avatar.rb

app/models/user/with_omniauth.rb

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

...munication/blocks/templates/call_to_action/_edit.html.erb

...munication/blocks/templates/call_to_action/_show.html.erb

...min/communication/blocks/templates/chapter/_edit.html.erb

...min/communication/blocks/templates/gallery/_show.html.erb

...cation/blocks/templates/organization_chart/_show.html.erb