fixed bug in client card;
Merge remote-tracking branch 'origin/master'