Merge remote-tracking branch 'origin/master' into robin5-datalayer

Conflicts:
	RouteTracker/src/main/java/edu/pdx/cs/pedal/routetracker/RouteCalculator.java
Merge pull request #45 from PedalPDX/robin5-datalayer

Robin5 datalayer
close #45
Merge remote-tracking branch 'origin/master' into rideList

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