updated object model
Merge branch 'master' of https://github.com/OPENi-ict/dao