Update on the service manager
Merge branch 'develop' of github.com:debranova/project into develop