[+Task] Added config and content generation for cms pages
Merge remote-tracking branch 'origin/master'