Refactoring Services and Customer
Merge remote-tracking branch 'origin/master'