changed SiteMap to static treeview for now
Merge branch 'upstream/develop'