-fixing the database class to ignore conflict when inserting stops to the
db
merge from changes
-renaming routeSelectActivity to RouteSelectActivity
-cleaning the AddAllStops and formating them