Added logingoogle activity and moved player services lib
Trip Activity Tests with minor changes to login/trip activity
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into calendarFile
removed some things I added to the TripActivity