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

app/assets/javascripts/admin/university/edit.js

app/controllers/extranet/academic_years_controller.rb

app/controllers/extranet/cohorts_controller.rb

app/controllers/extranet/home_controller.rb

app/controllers/extranet/organizations_controller.rb

app/controllers/extranet/persons_controller.rb

app/models/education/program.rb

app/models/education/school.rb

app/models/university/person/alumnus/import.rb

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

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

config/locales/en.yml

config/locales/fr.yml

config/routes/extranet.rb

db/schema.rb