Data conceptual model added
Merge branch 'master' of https://github.com/CargoWizard/CargoWizard