items and small fixes
items and small fixes
respond to request to join trips
fixed invite friends error
finished merge