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

app/assets/stylesheets/admin/appstack.sass

app/helpers/admin/application_helper.rb

app/views/admin/application/_top.html.erb

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

app/views/devise/two_factor_authentication/show.html.erb

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

app/views/server/layouts/application.html.erb

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

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

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

config/environments/production.rb

config/locales/en.yml

config/locales/fr.yml

config/storage.yml