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

...ntrollers/admin/communication/website/posts_controller.rb

app/models/ability.rb

app/models/user/with_roles.rb

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

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

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

app/views/admin/users/_form.html.erb

config/admin_navigation.rb

config/locales/en.yml

config/locales/fr.yml