Initial support for adding popup content to features in AOIs.
fixed url for javascript library
Merge branch 'issue52' into develop

Conflicts:
	geoq/core/static/core/js/aoi_feature_edit.js
Adapted feature popup code to Jay's approach.
Minor code format fix.
Fixed response serialization bug in CreateFeatures.
Add new feature to db before displaying it on the map.
Removed references to unneeded drawnItems.
Added support for deleting feature.
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
add error checking for external GeoConvert app
Merge branch 'develop' of ssh://github.com/ngageoint/geoq into develop

Conflicts:
	geoq/core/static/core/js/aoi_feature_edit.js
	geoq/core/templates/core/edit.html
	geoq/mgrs/utils.py
Added more error handling for mgrs service
don't try to send gamification message if service not enabled (commented out in settings)
Fix for when icons aren't set