Ashok - Changed the name - Added loing link admin@example.com/password
Ashok - Fixed conflict
Merge branch 'master' of github.com:TWChennai/plan_com_india
Ashok - Fixed merge conflicts