-1000 lines!!!!!!!!!!!!!!!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/test/java/be/kdg/trips/TripTest.java
Merge remote-tracking branch 'origin/master'
/users ++
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/test/java/be/kdg/trips/TripTest.java
triptest
Merge remote-tracking branch 'origin/master'