Merge branch 'dev'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml

1 files changed, 4 insertions, 4 deletions

diff --git a/src/net/cbaines/suma/RouteStops.java b/src/net/cbaines/suma/RouteStops.java
index 1206153..29fb18c 100644
--- a/src/net/cbaines/suma/RouteStops.java
+++ b/src/net/cbaines/suma/RouteStops.java
@@ -40,18 +40,18 @@ public class RouteStops {
 
     // This is a foreign object which just stores the id from the User object in this table.
     @DatabaseField(foreign = true, columnName = STOP_ID_FIELD_NAME, indexName = "routestops_routestop_idx")
-    BusStop stop;
+    BusStop busStop;
 
     // This is a foreign object which just stores the id from the Post object in this table.
     @DatabaseField(foreign = true, columnName = ROUTE_ID_FIELD_NAME, indexName = "routestops_routestop_idx")
-    BusRoute route;
+    BusRoute busRoute;
 
     RouteStops() {
     }
 
     public RouteStops(BusStop stop, BusRoute route, int sequence) {
-	this.stop = stop;
-	this.route = route;
+	this.busStop = stop;
+	this.busRoute = route;
 	this.sequence = sequence;
     }
 }