add ResultHistoryActivity and customized listView
merge string.xml
Merge commit 'ORIG_HEAD' into develop
es/strings.xml

Conflicts:
	res/values/strings.xml
Merge branch 'develop' of https://github.com/NFC-Orienteering/NFC-Orienteering.git into develop