ajax bugfix
Merge remote-tracking branch 'origin/player'