changes made 42 cms page
resolved conflicts and merging issue-96 into develop