Finish TripDetailsDriverActivity
Finish TripDetailsBlock
Merge branch 'master' of ssh://git@github.com/Teti/UTBM_Carpooling.git

Conflicts:
	AndroidManifest.xml
	gen/fr/utbm/carpooling/R.java
	res/layout/view_checkpoint_trip.xml
	res/layout/view_trip_details.xml
	res/values/strings.xml
	src/fr/utbm/carpooling/view/widgets/DriverCarItem.java
	src/fr/utbm/carpooling/view/widgets/TripCheckpoint.java
	src/fr/utbm/carpooling/view/widgets/TripDetailItem.java
	src/fr/utbm/carpooling/view/widgets/TripDetailsDriverItem.java
	src/fr/utbm/carpooling/view/widgets/TripSubscriber.java