Models update
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/app/models/objects/Itinerary.java
	carpooling/app/models/objects/PickupPoint.java
Merge resolved