major cleanup, removing imports and unused old classes
Merge branch 'master' of https://github.com/ilantc/NeedARide
resolving conflicts
Conflicts:
	AndroidManifest.xml
	src/com/example/needaride/MainActivity.java
	src/com/needaride/DriverAddRideDetailsActivity.java