set up tree navigation
Merge remote-tracking branch 'origin/master'

Conflicts:
	starter-web/src/main/webapp/app/controller/Viewport.js
	starter-web/src/main/webapp/app/view/Content.js
	starter-web/src/main/webapp/app/view/Head.js