Merge branch 'master' into post_description_short

...lers/admin/communication/website/categories_controller.rb

...ers/admin/communication/website/index_pages_controller.rb

...ntrollers/admin/communication/website/pages_controller.rb

app/models/communication/website.rb

app/models/communication/website/category.rb

...ls/communication/website/index_page/education_programs.rb

app/models/communication/website/with_abouts.rb

app/models/communication/website/with_dependencies.rb

app/models/communication/website/with_menu_items.rb

app/models/communication/website/with_program_categories.rb

app/models/concerns/aboutable.rb

app/models/education/school.rb

app/models/research/journal.rb

app/models/research/laboratory.rb

app/models/university/person/administrator.rb

app/models/university/person/author.rb

app/models/university/person/researcher.rb

app/models/university/person/teacher.rb

...ews/admin/communication/website/categories/_form.html.erb

...iews/admin/communication/website/categories/show.html.erb