Merge pull request #31 from techiev2/users

Users app merge fixes