fix for long wordmarks...
use promise in media
fix for GG not loading images
SpecialPromoteTest: improve mocking
Merge branch 'fixes-for-gameguides' into dev
Merge remote-tracking branch 'origin/dev' into dev
WikiaApp / WikiaController: a bit of linting
bugid:96962 - phplint fix
bugid:96963 - phplint fix
Merge pull request #408 from Wikia/bugid-96962-sd-phplints

Bugid 96962 sd phplints
removed undefined constant after php lint
Merge branch 'bugid-96966' into dev
bugid-96011: Create sponsored image in Hubs - new messages
removing temporary fix for BugzId:96472
Making requested copy change
Add category select add button to tracking.
Merge branch 'dev' into phalanx-redoux