Changes for QA environment
Merge pull request #11 from PopSugar/cp-cesqa

Changes for QA environment