Simplified user migration. Added role migration.
Merge branch 'feature/rolemigration'