alters database schema
Merge remote-tracking branch 'origin/master' into pgbuilder
Merge remote-tracking branch 'origin/dbgen' into pgbuilder
updates gantt chart
fixes conflict
updates gantt chart