Add a default constructor so we can deserialize from json
Merge remote-tracking branch 'origin/v0.7-cvent' into v0.7-cvent