Added relationship Trip - USer
Added relationship Trip - USer
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
added most relations to trip
fixed test delete trip
Merge remote-tracking branch 'origin/master'