Fixe Bug and update build.sh
Add Database and userDAO
Merge branch 'lab'