Merge branch 'dev' into browse-wip-dont-merge
Fix positioning and z-index
Merge remote-tracking branch 'origin/styleguide' into browse-wip-dont-merge

Conflicts:
	skins/oasis/css/core/GlobalHeader.scss
Merge remote-tracking branch 'origin/dev' into browse-wip-dont-merge

Conflicts:
	includes/wikia/Wikia.php
	skins/oasis/css/core/GlobalHeader.scss
	skins/oasis/js/hoverMenu.js
	skins/oasis/modules/GlobalHeaderController.class.php
Merge remote-tracking branch 'origin/styleguide' into browse-wip-dont-merge

Conflicts:
	includes/wikia/Wikia.php
DAR-1485 | Bugfix after merges
Merge remote-tracking branch 'origin/browse-wip-dont-merge' into DAR-1485

Conflicts:
	skins/oasis/css/core/GlobalHeader.scss
	skins/oasis/css/core/GlobalNotification.scss