CON-1448 | Global nav on  editpage
Merge pull request #4491 from Wikia/CON-GlobalNav

Con global nav
Merge branch 'CON-Venus' into CON-1446-user-login-menu

Conflicts:
	extensions/wikia/GlobalNavigation/css/GlobalNavigationOasis.scss