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

app/models/ability.rb

app/models/communication/website.rb

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

app/models/communication/website/page.rb

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

...ews/admin/communication/website/menu/items/_form.html.erb

...ews/admin/communication/website/menu/items/_list.html.erb

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

...iews/admin/communication/website/menu/items/show.html.erb

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

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

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

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

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

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

config/locales/communication/en.yml

config/locales/communication/fr.yml