test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/be/kdg/teamf/dao/TestUserDAO.java
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/be/kdg/teamf/dao/TestTripDAO.java
	src/test/java/be/kdg/teamf/dao/TestUserDAO.java
test