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

app/assets/stylesheets/commons/_forms.sass

app/helpers/admin/application_helper.rb

app/models/communication/website/page.rb

app/models/education/program.rb

app/models/user/with_authentication.rb

app/views/admin/administration/members/_list.html.erb

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

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

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

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

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

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

app/views/admin/education/programs/_list.html.erb

app/views/admin/education/programs/_treebranch.html.erb

app/views/admin/research/journal/articles/_list.html.erb

app/views/devise/registrations/edit.html.erb

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

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

config/locales/en.yml

config/locales/fr.yml