fixed build error
Changed routes to have section + tree
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0

Conflicts:
	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
	src/Umbraco.Web.UI.Client/src/routes.js
remove un-needed files
updated ignore to ignore these new strange merge files for routes.js