Shapes are now loaded faster and get painted in ROI Display properly.
Merge remote-tracking branch 'origin/upload_shapefiles' into upload_shapefiles