updated migrations for webservice needs
Merge branch 'model' into security