entities and dao classes
Merge origin/master