created 42 cms controller
42 cms page
Merging issue-17 into develop and resolving conflicts