user and my*changes
Merge branch 'master' of https://github.com/pirovorster/ServiceHub