update sitemap generation
Merge branch 'master'

Merged the develop into master