Android My Trips + Registered Trips
Merge remote-tracking branch 'origin/master'