new nav bar
Merge branch 'navbar'

* navbar:
  new nav bar