hotfix
Merge branch 'dev'
fixed navbra logo