migration edit: "user email not required and not unique"
Merge branch 'develop'
Merge branch 'master' into develop