fixed navbar logo issue
Merge branch 'master' into production