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

Gemfile

Gemfile.lock

app/assets/javascripts/admin.js

app/assets/javascripts/admin/plugins/sortable.js

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

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

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

app/controllers/admin/education/programs_controller.rb

...llers/admin/education/school/administrators_controller.rb

...trollers/admin/education/school/role/people_controller.rb

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

app/controllers/admin/education/schools_controller.rb

app/controllers/admin/education/teachers_controller.rb

app/models/ability.rb

app/models/communication/website.rb

app/models/communication/website/with_abouts.rb

app/models/communication/website/with_menu_items.rb

app/models/education/program.rb

app/models/education/program/role.rb

app/models/education/program/role/person.rb