add edit subsite
edit multisite works
improve gitignore
fix nordrassil bugs
Merge branch 'upstream-development' into dev-features