add describing some services
Merge branch 'master' into api

Conflicts:
	data/client build