Saving temp
Add service_options and clinics display
Merge branch 'features/service-option-clinics'

Conflicts:
	app/scripts/controllers/service_option_controller.js
	app/scripts/routes/service_option_route.js
	app/scripts/routes/service_options_route.js
	app/templates/service_option.hbs
	app/templates/service_options.hbs