add some changes to dbManager
Merge branch 'testtest'