First modification of player
Merge remote-tracking branch 'origin/master'

Conflicts:
	player.php
	player_example.php
Repair of merging