Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/model/Trip.java
	src/main/java/be/kdg/service/TripService.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/model/Trip.java
	src/main/java/be/kdg/service/TripService.java
geolocation self and otheruser locations + tripwaypoints
geolocation self and otheruser locations + tripwaypoints
Merge remote-tracking branch 'origin/master'