Lost of general changes with relationships
2nd pass of data model
Fixed migration conflicts
deleted db
Merge branch '2ndPassApi' into develop