changes on 10-04-2013..
Merge branch 'master' of https://github.com/arundecent/ComputerizedRideShare

Conflicts:
	.classpath
	.gitignore
	build/classes/SqlMapConfig.xml
	build/classes/com/crs/data/cQueries.xml
	build/classes/com/crs/data/cmQueries.xml
	build/classes/com/crs/data/queries.xml
	build/classes/com/crs/service/EmailService.class
	build/classes/com/crs/service/LoginService.class
	build/classes/com/crs/service/SchedulerService.class
	build/classes/struts.xml
	src/com/crs/data/cmQueries.xml
	src/com/crs/service/LoginService.java
CancelPickup
Merge branch 'master' of https://github.com/arundecent/ComputerizedRideShare