修改了MisicDao中的一个错误
Merge branch 'master' of https://github.com/junior-training/music_online
修改了歌词的后台代码。
Merge branch 'master' of https://github.com/junior-training/music_online

Conflicts:
	src/com/music_online/dao/MusicDao.java
Merge branch 'master' of https://github.com/junior-training/music_online
修改了更新流行度的后台代码。
Merge branch 'master' of https://github.com/junior-training/music_online

Conflicts:
	WebRoot/src/player.js