modified database to include non autoincrement id
Merge branch