Navbar links
Merge branch 'master' of https://github.com/simoncomputing/Ghost

Conflicts:
	src/main/webapp/WEB-INF/flows/ghost/index.jsp