updated local data
fix zoom problem on search
Merge remote-tracking branch 'upstream/master'
changed companions
support for cic.naco.org
refactored fillmapcolors and fixed bug where selected would change color
Merge pull request #286 from jpecht/master

bug fixes, support for cic.naco.org