google maps integration + trip waypoints
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/IndividualTripController.java
	src/main/java/be/kdg/model/Trip.java
google maps integration + trip waypoints