42 cms page
conflicts resolved
merging issue-73 develop and resolving conflicts