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

app/controllers/admin/communication/websites_controller.rb

...rollers/admin/education/program/role/people_controller.rb

...ontrollers/admin/education/program/teachers_controller.rb

app/models/ability.rb

app/models/communication/website.rb

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

app/models/communication/website/post.rb

app/models/communication/website/with_abouts.rb

app/models/user/with_roles.rb

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

app/views/admin/education/program/role/people/new.html.erb

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

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

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

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

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

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

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

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

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