WIP
Revert "WIP"

This reverts commit 76be30110befeb1705ff869347ccdab2e912051f.
Merge branch 'develop' of https://github.com/marwijn/SaltarelleJayData into develop