Added mailmap
Merge remote-tracking branch 'zhen/master'
Sqlite3 for dev database
Test fixes
Fix submodule
Merge commit '34685ca557c48ea8fd7b33620e6ad95374ac4f08'

* commit '34685ca557c48ea8fd7b33620e6ad95374ac4f08':
  Fix submodule
  Test fixes
  Sqlite3 for dev database
  Added mailmap