changes to cms page
changes to the cms page
deleted css files from the css folder
conflicts resolved with issue-47 and merged with develop