Added new shortcode sitemap
Added sitemap.xml generatior
Fix prev commit
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop
output content in FAQ pages
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop

Conflicts:
	admin/data_management/update.php