Changes to model, service and controller Files
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/RestUserController.java
	src/main/java/be/kdg/groepi/model/Requirement.java
	src/main/java/be/kdg/groepi/model/Trip.java
	src/main/java/be/kdg/groepi/model/User.java
	src/main/java/be/kdg/service/UserService.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fix userService equal test
fix tripService equal test in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
test push
Merge remote-tracking branch 'origin/master'