#1  modyfied Service entity

deleted locationId
Merge branch 'master' of https://github.com/worm1k/OSS_Cauliflower