developing cms page-boonex
developing cms page-boonex
merging issue-36 into develop and resolving conflicts