alternative DB & fix DAO code
Merge branch 'master' of https://github.com/revan-kun/inTouch.git