Added forgot password functionality
Conflict resolved and removed unwanted urls and views