Merge pull request #284 from jpecht/master

updated all htmls
updated local data
fix zoom problem on search
changed active styling to red with yellow stroke
Merge remote-tracking branch 'upstream/master'
changed companions
support for cic.naco.org
refactored fillmapcolors and fixed bug where selected would change color