[SSF] Minor Tweak

[Deploy] Minor Fix
WARNING: PRODUCTION SITES WILL NEED DATABASE MIGRATIONS
- MIGRATION SCRIPT WILL COME LATER
GIS: Change Data Model to make it more logical where folder & styling
elements go
GIS: Allow dynamic changes to layers via custom s3 section in returned
GeoJSON (used by report.geojson() to fallback to Points when zooming in
beyond the Admin Areas available)
GIS: Optimise exports by adding per-Layer url_format instead of
per-Feature url
MCOP: Fix Task.geojson
Vulnerability: Update OL build
Update all templates to use popup_format instead of the to-be deprecated
popup_label & popup_fields, as well as for the model changes
Deprecate various templates to reduce maintenance overheads (can still
retrieve from GitHub if reference is wished to be made to them)
Merge pull request #880 from hitesh96db/msg

[SSF] Minor Tweak
Cleanups, fix invalid line end character in s3resource.py that made the
file appear distorted in some (non-Windows) editors