Merge remote-tracking branch 'origin/master'

Conflicts:
	class/logic/handcard.h