Adding Google Map
Adding Google Play Services
Adding activity maps
Adding additional condition for showing Google Maps
Adding some lines to show google maps
Adding permission for showing Google Maps
Adding button to call Google Maps
Adding maps button
get the list point and pass the value into Maps.class
Update Maps.class
Update Maps.class for testing if people dont have trip
Merge pull request #34 from PedalPDX/robin5-uploader-service

Robin5 uploader service
Merge branch 'master' into adding-points-into-maps

Conflicts:
	RouteTracker/build.gradle
	RouteTracker/proguard-rules.txt
	RouteTracker/src/main/AndroidManifest.xml
	RouteTracker/src/main/java/edu/pdx/cs/pedal/routetracker/MainActivity.java
	RouteTracker/src/main/res/layout/activity_main.xml
	RouteTracker/src/main/res/layout/activity_maps.xml

Replace master's Maps.java with adding-points-into-maps' version.
fixed automerge duplicate code

removed duplicate code that was introduced with automerge of master
into adding-points-into-maps branch. Working fine now.

Issue #41
Close #41
Merge pull request #41 from PedalPDX/adding-points-into-maps

Adding points into map ... tested, works.
Merge remote-tracking branch 'origin/master' into robin5-datalayer

Conflicts:
	RouteTracker/src/main/java/edu/pdx/cs/pedal/routetracker/RouteCalculator.java