finished general plot computation on server side
Merge remote-tracking branch 'origin/upload_shapefiles' into upload_shapefiles