Merge branch 'temporary'

Conflicts:
	src/main/java/com/realdolmen/rdtravel/controller/PaymentController.java
	src/main/java/com/realdolmen/rdtravel/controller/SessionController.java
	src/main/java/com/realdolmen/rdtravel/controller/TripController.java
	src/main/java/com/realdolmen/rdtravel/service/TripService.java
	src/main/webapp/TripList.xhtml
	src/main/webapp/detailTrip.xhtml
Merge remote-tracking branch 'origin/master'