Merge pull request #326 from vaibhavcisin274/manish

Manish
changes before login 30-Aug
Merge pull request #327 from vaibhavcisin274/vaibhav

changes before login 30-Aug
solve issue of country zone
solve issue of country zone