PlayerJS + Timer + global change
Merge remote-tracking branch 'origin/master' into Kannar