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

app/controllers/admin/education/programs_controller.rb

app/models/communication/website.rb

app/models/concerns/with_publication_to_websites.rb

app/models/concerns/with_tree.rb

app/models/education/program.rb

app/models/education/school.rb

app/models/education/teacher.rb

app/models/research/journal.rb

app/models/research/researcher.rb

app/models/university/with_education.rb

...min/communication/website/categories/_treebranch.html.erb

...ws/admin/communication/website/pages/_treebranch.html.erb

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

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

app/views/admin/education/programs/children.js.erb

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

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

app/views/admin/education/teachers/jekyll.html.erb

app/views/admin/research/researchers/jekyll.html.erb

config/routes/admin/education.rb