Merge branch 'master' of https://github.com/NetEaseWD/NEJ.git

Conflicts:
	src/util/media/playlist.js
Merge branch 'master' of https://github.com/NetEaseWD/NEJ.git