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

Gemfile.lock

app/assets/stylesheets/admin/treeview.sass

...lers/admin/communication/website/categories_controller.rb

...ntrollers/admin/communication/website/pages_controller.rb

app/controllers/admin/communication/websites_controller.rb

app/models/communication/website/category.rb

app/models/communication/website/imported/category.rb

app/models/communication/website/imported/website.rb

app/models/communication/website/page.rb

app/services/wordpress.rb

...ews/admin/communication/website/categories/_form.html.erb

...ews/admin/communication/website/categories/_list.html.erb

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

...ws/admin/communication/website/categories/children.js.erb

...ews/admin/communication/website/categories/index.html.erb

...iews/admin/communication/website/categories/show.html.erb

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

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

app/views/admin/communication/websites/import.html.erb

app/views/admin/communication/websites/show.html.erb