ADEN-163 ADEN-229 gpt for corp and hub pages
added title resolution as a service to search controller
ADEN-253 Check GPT ad height by div not by iframe
DAR-286: excluding blacklist in WamService fix
BAC-317: send /reload to the service when blocks are added/modified/removed using old special page
PLA-253 -- removed str_word_count from default content due to issues with utf-8
Merge branch 'video-search-entities' into dev

Conflicts:
	extensions/wikia/Search/WikiaSearchController.class.php
change SQL query to check user groups without suffix '-global' (like bot-global, checkuser-global) (BAC-303)
BAC-317: add more debugging
MAIN-145: use CACHE_VERSION when building key for SASS caching
fix query for selecting count of users (BAC-303)
MOB-162 Unfortunately I need to check for it twice
Merge branch 'MOB-162-Broken-galleries-on-modal' into dev
Merge branch 'PLA-253-alternate' into dev
fix variable typo
Merge branch 'PLA-350' into dev
fix unit test for video query service
temporary disabling of failing unit test
skip test instead of failing if phalanx-dev is not available
fix wgDevBoxImageServerOverride