Cancel car pool drive
resolving conflicts
resolving
merged with the changesMerge branch 'master' of https://github.com/arundecent/ComputerizedRideShare

Conflicts:
	build/classes/com/crs/data/cmQueries.xml
	build/classes/com/crs/data/queries.xml
	src/com/crs/dao/CrsDAO.java
	src/com/crs/data/queries.xml
	src/com/crs/service/SchedulerService.java