schema update
[fixes#74794340] display service type on service profile page
Merge remote-tracking branch 'upstream/develop' into develop
Fix issues with trip final screen and print
Merge pull request #136 from CG-CamSys/281-trip-selection-and-printing-issues

Fix issues with trip final screen and print
without this the schema file fails to load
Merge pull request #137 from CG-CamSys/282-postgis-error

without this the schema file fails to load
Merge branch 'develop' into 271_update_trip_purpose_view