removed activity shit
Changed get_trip javascript function
small changes
Merge branch 'trip' of https://github.com/khalua/travlr into trip
buggy
Changed trip_return javascript function in st-trip.js
Merge branch 'trip' of https://github.com/khalua/travlr into trip
Editted get_trip and trip_return functions
Merge branch 'trip' of https://github.com/khalua/travlr into trip