Merge pull request #5793 from Wikia/CON-2326-release255

Con 2326 release255
Conflicts:
	extensions/wikia/GlobalNavigation/GlobalNavigation.setup.php
	extensions/wikia/GlobalNavigation/GlobalNavigationHooks.class.php
Merge pull request #5795 from Wikia/CON-2358-r255

CON-2358 | Venus - fix for global footer covered by adskin - relase-255
Merge pull request #5768 from Wikia/CON-Search-r255

CON-Search | Fixes for GlobalNavigation search
Conflicts:
	extensions/wikia/GlobalNavigation/GlobalNavigation.setup.php
	extensions/wikia/GlobalNavigation/GlobalNavigationController.class.php
	extensions/wikia/GlobalNavigation/GlobalNavigationHelper.class.php
	extensions/wikia/GlobalNavigation/templates/GlobalNavigation_searchIndex.php
	extensions/wikia/GlobalNavigation/tests/GlobalNavigationTest.php