Merge remote-tracking branch 'origin/ui' into businesslogic

Conflicts:
	scores.txt

merged ui
Tweaked hint at startup
Merge remote-tracking branch 'origin/businesslogic' into ui

merged businesslogic