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

Gemfile.lock

app/controllers/admin/communication/websites_controller.rb

app/controllers/admin/university/people_controller.rb

app/models/communication/website.rb

app/models/communication/website/menu/item.rb

app/models/communication/website/with_abouts.rb

app/models/concerns/with_git.rb

app/models/education/program/teacher.rb

app/models/education/school/administrator.rb

app/models/research/journal/article.rb

app/models/research/journal/volume.rb

app/models/university/person.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/menu/items/_form.html.erb

...admin/communication/website/menu/items/kind_switch.js.erb

app/views/admin/communication/website/menus/static.html.erb

app/views/admin/communication/websites/_form.html.erb