Replaced services data gathering code

Jira-issue: WP-1296
Replace users data gathering code

Jira-issue: WP-1296
Fixed services and APIs discovery

Jira-issue: WP-1296
Merge pull request #22 from ccameroni/WP-1296-collect-people-and-services-data

WP-1296 collect people and services data