Only "join trip" or "leave trip" will now show once entering tripevents.
Merge branch 'master' of https://github.com/hugoleandersson/TravelMatch

Conflicts:
	js/services.js