Adds map layers to edit form & makes edit and create form the same form.
Merge remote-tracking branch 'upstream/master'
Fixes map layer saving bug and validation on the map form.
Flake 8 clean up on map views file.
Adds map layers to edit form & makes edit and create form the same form.
Fixes map layer saving bug and validation on the map form.
Flake 8 clean up on map views file.
Merge branch 'master' of github.com:presidential-innovation-fellows/geoq
Updating paver to remove badge load data, because badges not installed.
Merge remote-tracking branch 'upstream/master'
Fixes #55: Makes AOI identifiable via id.
Fixes #55: Better solution, b/c save doesn't run on bulk create.
Fixes #10: Removes create links from job & aoi on dashboard page.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Minor model file clean up.
Minor admin.py file clean up.
Merge pull request #1 from jackiekazil/master

Resolves multiple AOI workflow issues
#26 - Have updated to add support for using ClusterFeature service to consume a MapService from ESRI.  Using feature options, a user can now pass additional parmeters to the API to set all settings.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Minor admin.py file clean up.
  Minor model file clean up.
  Fixes #10: Removes create links from job & aoi on dashboard page.
  Fixes #55: Better solution, b/c save doesn't run on bulk create.
  Fixed loading of GeoJSON items
  Fixed loading of GeoJSON items
  Added function so GeoJSON types will work with ESRI-formatted GeoJSON

Conflicts:
	geoq/core/static/core/js/leaflet_helper.js