Merge pull request #26 from techiev2/users

Fix for user app flow interruption and code regeneration
Fixes regex for test data
Merge branch 'master' into tests