added ability to have multiple icons and polygon drawing tools
changed url for underscore lib
Merge branch 'develop' of ssh://github.com/stephenrjones/geoq into develop
some cleanup for edit page
changes for displaying colored icons