Forgot Password (1/2)
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution

Conflicts:
	application/controllers/login.php
Merge branch 'master' of https://github.com/sharadrsoni/akshar_design_solution