add logo to navbar-brand
Merge remote-tracking branch 'origin/master'
refactoring navbar. ref #323