Trips / Deelname trips / eigen trips
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/webapp/resources/js/trips.js
Merge remote-tracking branch 'origin/master'