edit subsite almost finish
remove unused files
Merge branch 'upstream-development' into dev-features