commit by binesh
ccsite responsive
conflicts resolved and merging issue-91 into develop