updated db models and added test script
add domain methods
Merge branch 'master' of https://github.com/OrgCurrent/Android into keith