Updated the UploadResultsActivity and other few tweaks.
Merge branch 'develop' of
https://github.com/NFC-Orienteering/NFC-Orienteering.git into develop

Conflicts:
	src/org/uta/nfcorienteering/activity/TrackResultsActivity.java