Merge pull request #75 from vaishali91/master

Add Cancel Button
Add Forgot Password
Merge remote branch 'upstream1/master'