updateScore done
Merge branch 'mergedBranch' of https://github.com/egetzner/appagainsthumanity into mergedBranch

Conflicts:
	HumanityTest/testdata/test.db
	HumanityTest/tmp/cached-robolectric-classes.jar