fix some bug
fix some bug
fix some bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	Soundcloud.class.php