- refactoring of service discovery to enable multiple types o services
Merge remote-tracking branch 'origin/master'