新增彩种 快乐扑克3
Merge branch 'master' into lichenxing