fixed topbar
Merge branch '2.0' of https://github.com/bigspring/monolith into 2.0

Conflicts:
	layouts/organisms/nav-topbar.php