updates
Merge branch 'master' of https://github.com/MalcolmPereira/com.malcolm.daotest.git
updates new data model