HSQL db
Merge origin/master
Added DAO layer v1.0