deleted create table statements
updates
merge conflicts
Merge branch 'mcbdn2-sprint1'

* mcbdn2-sprint1:
  deleted create table statements