udpated player twig
updated player
Merged 'staging'
Updated player