Merge remote-tracking branch 'origin/master'
Navbar-static-top converted