ScoreCardScreen now displays
Merge branch 'master' of https://github.com/clubberstake/Golfr

Conflicts:
	eclipseClientProject/GolfrClient/bin/GolfrClient.apk
	eclipseClientProject/GolfrClient/bin/classes.dex