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

app/assets/stylesheets/admin/appstack.sass

app/helpers/admin/application_helper.rb

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

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

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

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

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

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

app/views/server/languages/show.html.erb

app/views/server/universities/show.html.erb

config/locales/en.yml

config/locales/fr.yml