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

app/assets/javascripts/admin/communication/init.js

app/assets/javascripts/admin/communication/posts.js

app/controllers/admin/communication/websites_controller.rb

app/models/communication/website.rb

app/models/communication/website/author.rb

app/models/communication/website/category.rb

app/models/concerns/with_tree.rb

...views/admin/communication/website/authors/jekyll.html.erb

...n/communication/website/authors/jekyll_collection.yml.erb

...ws/admin/communication/website/categories/jekyll.html.erb

...ommunication/website/categories/jekyll_collection.yml.erb

app/views/admin/communication/website/posts/_form.html.erb

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

config/locales/communication/en.yml

config/locales/communication/fr.yml

...d_authors_github_directories_to_communication_websites.rb

db/schema.rb

lib/tasks/app.rake