Initial navbar commit
Merge branch 'navbar' into develop