Services listings
Merge remote-tracking branch 'upstream/master'
	modified:   app/controllers/services_controller.rb
fix optimus
Merge remote-tracking branch 'upstream/master'