Changes made by Vikash Srivastava (srivastava.ait@gmail.com).
Changes made by Vikash Srivastava (srivastava.ait@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/OperatorProfile.html
	E4Cabs/customerRegister.html
	E4Cabs/js/OperatorProfile.js
	E4Cabs/js/customerRegister.js
	E4Cabs/js/login.js
Changes made by Vikash Srivastava (srivastava.ait@gmail.com).
Changes made by Vikash Srivastava (srivastava.ait@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/OperatorProfile.html
	E4Cabs/js/login.js
Changes made by Vikash Srivastava (srivastava.ait@gmail.com).
Changes made by Vikash Srivastava (srivastava.ait@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/customerRegister.html
	E4Cabs/driverRegister.html
	E4Cabs/js/driverRegister.js
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/OperatorProfile.html
	E4Cabs/driverAfterlogin.html
	E4Cabs/js/driverAfterlogin.js
	E4Cabs/login.html
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git
Changes made by Vikash Srivastava (srivastava.ait@gmail.com).
Changes made by Vikash Srivastava (srivastava.ait@gmail.com).