GUI QUICKFIX
Merge remote-tracking branch 'origin/Gui'

Conflicts:
	Cards/Thumbs.db