Added a sitemap
Merge remote-tracking branch 'origin/edge'