Finished drawing of shapes onto map
Merge remote-tracking branch 'origin/upload_shapefiles' into upload_shapefiles

Conflicts:
	middleware/portalflask/core/shapefile_support.py
Fix