Merge remote-tracking branch 'origin/unstable' into route_list
Merge remote-tracking branch 'origin/database' into unstable

Conflicts:
	src/com/overthink/thembtaapp/model/Route.java
Merge remote-tracking branch 'origin/database' into route_list

Conflicts:
	res/layout/item_list_route.xml
	res/values/colors.xml
Merged with databases branch.
Changed implementation of database helper to accept List of key-value pairs to add rather than one. Allows atomicity. Which is totally a word.
Added check for GooglePlayService
Merge remote-tracking branch 'origin/route_list' into unstable

Conflicts:
	src/com/overthink/thembtaapp/model/Route.java
Continued updated DB API
Merge remote-tracking branch 'origin/unstable' into database
RouteListOpenHelper.addRoutes() completed
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
Merge remote-tracking branch 'origin/unstable' into unstable

Conflicts:
	res/layout/favorites_list.xml
	res/layout/fragment_favorites.xml
	res/layout/item_list_route.xml
	src/com/overthink/thembtaapp/model/Route.java
	src/com/overthink/thembtaapp/ui/FavoritesAdapter.java
Completed 4 of 6 eventual API methods for interacting with the routes table
Merge remote-tracking branch 'origin/database' into unstable
Updated Manifest file for new library
Made all DB methods async
Changed RouteListAdapter to CursorAdapter. Made RouteListFragment abstract and extended five new classes from it, one for each route list that is displayed.
Merge remote-tracking branch 'origin/database' into multiple_route_lists
Merged with database branch.