branch navbar
Merge branch 'navbar'