Merge pull request #5691 from Wikia/CON-2324

CON-2324 fix url under wikia logo
Conflicts:
	extensions/wikia/GlobalNavigation/GlobalNavigation.setup.php
Merge pull request #5737 from Wikia/CON-2325

Con 2325
Conflicts:
	extensions/wikia/GlobalNavigation/templates/GlobalNavigation_searchIndex.php
Merge pull request #5768 from Wikia/CON-Search-r255

CON-Search | Fixes for GlobalNavigation search