fix bug number of cards
OMerge branch 'eduUI_1.1'