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

app/controllers/admin/users_controller.rb

app/models/university/person/experience.rb

app/models/university/person/with_experiences.rb

app/models/user.rb

app/services/filters/admin/users.rb

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

app/views/admin/research/researchers/index.html.erb

app/views/admin/university/alumni/_list.html.erb

app/views/admin/university/alumni/show.html.erb

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

config/locales/en.yml

config/locales/fr.yml

db/schema.rb