Quite a few chnages.
Merge branch 'master' of https://github.com/mpatt3970/Trail-Tracker

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/mines/edu/activities/RecordActivity.java