ScandiPal: merge both sides of the fragments.
Merge branch 'staging' of github.com:kcl-ddh/digipal into staging