Bunch of changes

Added a saved route screen which is going to pull routes from the
database. Also, the map now shows your current location and has a
button to set it
Merge branch 'master' of https://github.com/prometheus-software/WhereYouApp

Conflicts:
	WhereYouApp/src/com/example/whereyouapp/AddRouteScreen.java