~ added local database
Merge branch 'master' into Rishabh