Merge branch 'model' of C:\Users\Gijs\Desktop\Model with conflicts.
Add label to trip
FindTripsByKeyword works except for labels
Merge remote-tracking branch 'origin/model' into model

Conflicts:
	.idea/workspace.xml
	src/main/java/be/kdg/trips/services/UserServiceImpl.java
Services are working!