Changes made by abhishek abhishek (abhishek_four@yahoo.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/forgotPassword.html
	E4Cabs/forgotUsername.html
	E4Cabs/index.html