made some changes to 42 cms page
Merging issue-29 into develop and resolving conflicts