Created web service task for Stop Details fragment, Added a stop details fragment stub to the project.
Created web service task for Stop Details fragment, Added a stop details fragment stub to the project.
Merge remote-tracking branch 'origin/StopDetails' into StopDetails1

Conflicts:
	src/com/overthink/thembtaapp/async/webservices/GetStopDetailsTask.java
Created web service task for Stop Details fragment, Added a stop details fragment stub to the project.
Added Google Map Fragment
Created web service task for Stop Details fragment, Added a stop details fragment stub to the project.
Created web service task for GetRoutes
Merge remote-tracking branch 'origin/unstable' into StopDetails1

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/overthink/thembtaapp/ui/HomeFragment.java
	src/com/overthink/thembtaapp/ui/MainActivity.java
Working Map Fragment
Added GetNearbyStopTask, GetRouteDetailTask, GetRoutesByStopTask, GetStopByRouteTask. All tested.
stop_details.xml layout updated
changes to the map.
Merge remote-tracking branch 'origin/unstable' into StopDetails1
Merge remote-tracking branch 'origin/route_list' into StopDetails1

Conflicts:
	project.properties
Merge remote-tracking branch 'origin/database' into StopDetails1

Conflicts:
	res/layout/item_list_route.xml
	res/values/colors.xml
	src/com/overthink/thembtaapp/ui/HomeFragment.java
Stop Details now uses route_list fragment in layout.
Added NearbyFragment. Currently has a map view and collects data from mbta to add to the map as pins. Still need to add stop names to pin and distance.
Added check for GooglePlayService
Merge branch 'StopDetails' of github.com:AnthonyReid99/The_MBTA_App into StopDetails1
Added NearbyFragment. Currently has a map view and collects data from mbta to add to the map as pins. Still need to add stop names to pin and distance. Subway button links to  stopDetail