getAllUsers from server added, login fixed
manual Merge