1. Merged DBHelper and DB into a single DB class
2. DBDAO uses the merged DB class
Merge branch 'master' into development