addd schedule id and generate schedules
updated data gen to add to db
Merge remote-tracking branch 'origin/master-working' into mstr-merge-test-kevin-martin