#1003: player screen resolution handled
#1003: merge conflict fixed in mycards,playerScreen
Merge branch 'master' of https://github.com/shitalma/UNO