made changes to the demo page and cms page
Merging issue-39 into develop and resolving conflicts