new database structure and database generator
Merge remote-tracking branch 'origin/master'