Merge branch 'work'
tree8d2c76b273502d850a150febe0f7666822669647
-rw-r--r-- 7 .gitignore
drwxr-xr-x - smart-abstract-dao
drwxr-xr-x - smart-hibernate-abstract-dao