Other cards drawn
Merge remote-tracking branch 'origin/master'

Conflicts:
	site/source/game/static/game/js/game.js
Merged