Merge branch 'master' into feature/alumnus

Gemfile

Gemfile.lock

app/assets/stylesheets/application.sass

app/assets/stylesheets/application/faceted_search.sass

app/controllers/extranet/home_controller.rb

app/controllers/extranet/persons_controller.rb

app/models/communication/website/page.rb

app/models/education/academic_year.rb

app/models/education/program.rb

app/models/education/school.rb

app/models/university/person.rb

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

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

app/models/university/person/with_education.rb

app/models/university/with_communication.rb

app/models/university/with_education.rb

app/models/university/with_people_and_organizations.rb

.../communication/website/configs/permalinks/static.html.erb

app/views/extranet/home/index.html.erb

...e_join_table_university_people_education_academic_year.rb