Corrected the login problem
Add the functionality for autocomplete cities
Resolve conflicts
Other changes
forgoten cmmit
adding missing commit files