Cleaned player functions
Merge remote-tracking branch 'origin/jorg'

Conflicts:
	player.js