.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/be/kdg/teamf/model/TestTripModel.java
	src/test/java/be/kdg/teamf/model/TestUserModel.java
	src/test/resources/be/kdg/teamf/model/TestUsers-context.xml
.
Merge remote-tracking branch 'origin/master'