Cleaned up SiteMap a bit (could not edit block on page without child pages)
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop