Merge pull request #1 from Liberton/player/newFeatures

Player - New Features
Merge remote-tracking branch 'upstream/master'
Commiting .user and small modifications