Added new tables and columns, the database design should be okay to start implementation
Merge remote-tracking branch 'origin/master'