Merge pull request #1171 from noesya/non-university

Gemfile.lock

app/assets/images/admin/osuny-thumb.jpg

...controllers/admin/communication/application_controller.rb

app/controllers/admin/university/application_controller.rb

app/controllers/application_controller/with_features.rb

app/controllers/server/universities_controller.rb

app/models/communication/extranet.rb

app/models/university.rb

app/views/admin/dashboard/_not_a_university.html.erb

app/views/admin/dashboard/_really_a_university.html.erb

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

app/views/admin/university/people/_form.html.erb

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

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

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

config/admin_navigation.rb

config/locales/administration/en.yml

config/locales/communication/en.yml

config/locales/communication/fr.yml

config/locales/education/en.yml