Commit
Merge branch 'develop' of
https://github.com/NFC-Orienteering/NFC-Orienteering.git into develop

Conflicts:
	res/menu/track_results.xml
	res/menu/upload_results.xml
Merge branch 'develop' of https://github.com/NFC-Orienteering/NFC-Orienteering.git into develop
Added ImageButtons and ActionBar.
Merge branch 'develop' of
https://github.com/NFC-Orienteering/NFC-Orienteering.git into develop

Conflicts:
	AndroidManifest.xml