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

Gemfile

Gemfile.lock

app/controllers/admin/application_controller.rb

app/controllers/admin/communication/extranets_controller.rb

app/controllers/admin/university/people_controller.rb

app/controllers/admin/users_controller.rb

app/controllers/extranet/organizations_controller.rb

app/controllers/extranet/persons_controller.rb

app/models/communication/website/post.rb

app/models/education/program.rb

app/models/education/school.rb

app/models/university/person.rb

app/models/university/person/administrator.rb

app/models/university/person/alumnus.rb

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

app/models/university/person/author.rb

app/models/university/person/researcher.rb

app/models/university/person/teacher.rb

app/services/filters/admin/university/people.rb

app/services/filters/admin/users.rb