Merge branch 'master' of C:\School\android\groepH with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/groepH_war.xml
	.idea/artifacts/groepH_war_exploded.xml
	.idea/workspace.xml
	groepH.iml
	src/main/java/be/kdg/groeph/service/TripServiceImpl.java
	src/main/webapp/pages/header.xhtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/pages/user/trip.xhtml
adding jersey