Merge branch 'Unstable' of https://github.com/scaryuncledevin/RenoTracks_Android

Conflicts:
	RenoTracks/src/org/nevadabike/renotracks/MarkActivity.java
	RenoTracks/src/org/nevadabike/renotracks/SaveTripActivity.java
Merge branch 'master' of https://github.com/scaryuncledevin/RenoTracks_Android

Conflicts:
	RenoTracks/src/org/nevadabike/renotracks/SaveTripActivity.java