minor changes (cards, player bars added)
Merge remote-tracking branch 'origin/master'