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

app/controllers/admin/university/people_controller.rb

app/models/communication/website/git_file.rb

app/models/communication/website/post.rb

app/models/communication/website/with_abouts.rb

app/models/education/program.rb

app/models/research/journal.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

app/services/git/repository.rb

app/views/admin/education/programs/static.html.erb

...iews/admin/education/school/administrators/_form.html.erb

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

config/locales/university/en.yml

config/locales/university/fr.yml

...10162001_rename_is_administration_in_university_people.rb