before merge to khushbuwork
Merge branch 'khushbuwork' of https://github.com/xavoctechnocratspvtltd/xsocialApp into vijaywork
Merge branch 'master' of https://github.com/xavoctechnocratspvtltd/xsocialApp into vijaywork
modified login & register View
conflict Resolved