new database scheme
Merge branch 'master' of https://github.com/kitinfo/Android-Application