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

app/models/communication/website/post.rb

app/models/research/journal/volume.rb

app/models/university/person.rb

app/views/admin/education/program/roles/_list.html.erb

app/views/admin/education/program/teachers/_list.html.erb

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

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

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

app/views/admin/research/journal/volumes/static.html.erb

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

test/fixtures/education/program/role/people.yml