changes to activities db table and added join trips_users table
Merge branch 'master' of https://github.com/khalua/travlr