Trip Activity Tests with minor changes to login/trip activity
Merge remote-tracking branch 'origin/master'