Changes made by Raghavendra Bhat (raghuhan100@hotmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git
Changes made by Raghavendra Bhat (raghuhan100@hotmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/Location.html