changes made on header and navigation
Merge branch 'origin/master'