Adding changes to Login flow and data entry flow
Merge branch 'master' of http://github.com/guptasachin25/3eesho

Merging current changes