modified:   app/controllers/admin/services_controller.rb
Merge remote-tracking branch 'upstream/master'