minor
Merge branch 'nav_devel' of github.com:boottp/e2 into nav_devel