Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/customerSearch.html
	E4Cabs/js/customerRegister.js
	E4Cabs/js/driverRegister.js
	E4Cabs/js/registerOperator.js
	E4Cabs/js/resetPassword.js
	E4Cabs/login.html
	E4Cabs/specialRequirement.html
Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).
Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).
Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/css/site.css
	E4Cabs/customerSearch.html
	E4Cabs/js/login.js
Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).
Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git
Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).
Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/OperatorProfile.html
	E4Cabs/css/site.css
	E4Cabs/customerRegister.html
	E4Cabs/customerSearch.html
	E4Cabs/driverRegister.html
	E4Cabs/forgotPassword.html
	E4Cabs/forgotUserId.html
	E4Cabs/js/OperatorProfile.js
	E4Cabs/js/customerRegister.js
	E4Cabs/js/forgotPassword.js
	E4Cabs/js/forgotUserid.js
	E4Cabs/js/login.js
	E4Cabs/login.html
	E4Cabs/registerOperator.html
Changes made by Raghavendra m.bhat (raghuhan99@gmail.com).