Changed the player to scale to different resolutions.
Merge remote-tracking branch 'origin/master'