Update player for RW
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/pages/player.html.erb