Ohoh Fehler im Anmarsch
Merge branch 'master' of https://github.com/CrashComp/GameCollection.git

Conflicts:
	GameCollection/res/values/strings.xml