Merge branch 'CON-899' into CON-814
CON-814: CSS for local search ab test
Merge branch 'dev' into CON-814

Conflicts:
	extensions/wikia/AssetsManager/config.php
CON-814: Changes after code review
Merge remote-tracking branch 'origin/CON-814' into CON-806

Conflicts:
	extensions/wikia/AssetsManager/config.php