update mail settings in cs
Merge pull request #38 from tonyrd/development

update mail settings in cs