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

app/controllers/admin/education/program/roles_controller.rb

app/models/concerns/with_media.rb

app/models/education/program/role.rb

app/models/education/school.rb

app/models/research/journal.rb

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

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

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

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

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

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

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

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

config/locales/education/en.yml

config/locales/education/fr.yml

config/routes/admin/education.rb