fixed conflict in Content service for CS Fixes
Merge pull request #17 from ikwattro/cs

fixed conflict in Content service for CS Fixes