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

...ssets/images/communication/blocks/templates/datatable.jpg

app/assets/images/communication/blocks/templates/embed.jpg

app/assets/images/communication/blocks/templates/files.jpg

app/assets/images/communication/blocks/templates/image.jpg

app/assets/images/communication/blocks/templates/video.jpg

app/assets/stylesheets/admin/styles.sass

app/controllers/admin/communication/blocks_controller.rb

...rs/admin/communication/websites/application_controller.rb

...ollers/admin/communication/websites/authors_controller.rb

...ers/admin/communication/websites/categories_controller.rb

...rs/admin/communication/websites/menus/items_controller.rb

...trollers/admin/communication/websites/menus_controller.rb

...trollers/admin/communication/websites/pages_controller.rb

...dmin/communication/websites/posts/curations_controller.rb

...trollers/admin/communication/websites/posts_controller.rb

app/controllers/admin/education/diplomas_controller.rb

...ollers/admin/education/programs/application_controller.rb

...llers/admin/education/programs/roles/people_controller.rb

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

...ntrollers/admin/education/programs/teachers_controller.rb