Merge branch 'master' into summernote

app/assets/stylesheets/admin/treeview.sass

...trollers/admin/communication/website/blocks_controller.rb

app/models/communication/website/block.rb

app/models/communication/website/page.rb

app/models/communication/website/with_abouts.rb

app/models/concerns/with_blocks.rb

app/views/admin/communication/website/blocks/_list.html.erb

...views/admin/communication/website/blocks/_static.html.erb

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

app/views/admin/communication/website/blocks/new.html.erb

...ebsite/blocks/templates/organization_chart/_edit.html.erb

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

...site/blocks/templates/organization_chart/_static.html.erb

...nication/website/blocks/templates/partners/_edit.html.erb

...nication/website/blocks/templates/partners/_show.html.erb

...cation/website/blocks/templates/partners/_static.html.erb

...min/communication/website/categories/_treebranch.html.erb

...min/communication/website/menu/items/_treebranch.html.erb

...ws/admin/communication/website/pages/_treebranch.html.erb

app/views/admin/communication/website/pages/show.html.erb