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