changes to cms page
Merge branch 'issue-66' into develop