improved navigation
Merge branch 'pm2waySync' of https://github.com/NoesisEnergy/bootstrap into pm2waySync

Conflicts:
	src/main/js/noesis/bootstrap/Entry.js