reorder imports for clarity and correctness
add dbwrapper
use dbwrapper for sqlcipher
changes file
Merge remote-tracking branch 'kali/feature/thread_safe-r2' into develop