Merge branch 'master' into DavidNg_Local
Move db backend from postgresql to sqlite
Merge branch 'DavidNg_Local'