updated database and table
Merge branch 'master' into yash