Added json header type
Another tweak to the waterleve definitions
Merge remote-tracking branch 'origin/dev' into dev