Igor's fix for filtering pins
fixed icon in filter box
manually merged master and resolved conflict in map.js
Merge pull request #101 from Wikia/MOB-1838

MOB-1838
Merge branches 'MOB-1806-pin-type-parent' and 'master' of https://github.com/Wikia/interactive-maps into MOB-1806-pin-type-parent