fix services
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb

	new file:   config/routes.rb