TripInstance:
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/be/kdg/groepi/service/TripServiceTest.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/groepi/controller/RestTripController.java
FB Login
Merge remote-tracking branch 'origin/master'