Fixed manage users failing cukes
Merge branch 'master' of https://github.com/Pranjalita/RapidFTR into fixing_manage_users_cukes
Merge branch 'master' into fixing_manage_users_cukes
fixed cukes nd done some refactrng
Merge pull request #503 from Pranjalita/fixing_manage_users_cukes

Fixing manage users cukes