Clean up Database API
Merge branch 'master' of github.com:fulldecent/cameralife