Datamodel classes uptated with v0.1 annotation schema.
All works with the new datamodel, although the output JSON still needs updating to v0.1.
Merge branch 'charme_datamodel_v0.1' into develop