Add the service_broker_id to the attributes exposed on a service through the API
Merge branch 'pull-request-163'

Conflicts:
	app/controllers/services/services_controller.rb
	app/models/services/service.rb
	spec/controllers/services/services_controller_spec.rb
Refactors: formatting and #service_broker_guid in service.rb