changes after moving config to JSON
Clean up after merging
Merge pull request #3878 from Wikia/MOB-1702

MOB-1702
Merge branch 'MOB-1392-intmap-extension' into MOB-1532

Conflicts:
	extensions/wikia/WikiaInteractiveMaps/WikiaInteractiveMapsController.class.php