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

app/controllers/admin/education/application_controller.rb

app/controllers/admin/education/programs_controller.rb

app/controllers/admin/education/teachers_controller.rb

app/models/communication/website/page.rb

app/models/concerns/with_slug.rb

app/models/education/program.rb

app/models/education/school.rb

app/models/education/teacher.rb

app/models/university/with_education.rb

app/views/admin/communication/website/pages/jekyll.html.erb

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

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

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

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

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

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

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

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

config/admin_navigation.rb

config/locales/education/en.yml