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