Fixed the links to events
Added a test for the site map
Merge branch 'master' into kingman