Signed-off-by: squarepp2 <ashida6@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	MusicPlayer/src/aplayer.php