CON-2282 Adjust right wordmark padding to mockups
Merge branch 'dev' into CON-2282-wordmark-grid-align
CON-2282 Add proper spacing around Wikia logo in global nav
CON-2282 Add proper spacing around community logo in local nav
CON-2282 Adding descriptive variables instead of magic numbers
Merge branch 'dev' into CON-2282-wordmark-grid-align
CON-2325 keep resultsLang after global search
Merge remote-tracking branch 'origin/CON-2324' into CON-2325

Conflicts:
	extensions/wikia/GlobalNavigation/GlobalNavigationHelper.class.php
	extensions/wikia/GlobalNavigation/templates/GlobalNavigation_searchIndex.php
CON-2282 Make minins medium first
CON-2282 Clearing out duplicated margin
Add wikiCategories to WikiVariables response
Capitalised PHPDoc types
CON-2326 remove unused code from OutputPage
CON-2326 add hook to resource loader and enable mwSuggests
Move method to WikiFactoryHub
CON-2325 use cont lang instead of user lang
Merge remote-tracking branch 'origin/dev' into CON-2325

Conflicts:
	extensions/wikia/GlobalNavigation/templates/GlobalNavigation_searchIndex.php
CON-2282 Breakup repeating media
CON-2282 change hum to hub :)
CON-2282 Combine padding to reduce number of properties