add schema file
resolve merge conflicts
add migration for all but users which were already done
Merge pull request #3 from hgw2101/migration

Migration