Separate users from contacts and accounts
Merge branch 'feature/LILY-178-seperate-users-and-contacts' into develop
Fix migration numbering after merge