Wikia/app — pull request #4225 by gabrys (2014-07-21 10:12:51+00:00)
Title: ADEN-1266 Ads for interactive maps (squashed, port from release-234)

Conflicts:
extensions/wikia/WikiaInteractiveMaps/css/intMapParserTag.scss
extensions/wikia/WikiaInteractiveMaps/js/WikiaInteractiveMapsParserTag.js
extensions/wikia/WikiaInteractiveMaps/templates/intMapParserTagMapIframe.mustache