Services and interfaces updated
resolved conflicts
Merge pull request #39 from Toranos/release2

Services and interfaces updated