适当分层
Merge remote-tracking branch 'origin/master'

Conflicts:
	LyricApi/bin/com/osmondy/kkdt/business/lyric/LyricDownloadService$DownloadTask.class
	LyricApi/bin/com/osmondy/kkdt/business/lyric/LyricDownloadService.class
	LyricApi/bin/com/osmondy/kkdt/business/lyric/LyricItem.class
	LyricApi/bin/com/osmondy/kkdt/business/lyric/LyricLoader.class
	LyricApi/bin/com/osmondy/kkdt/business/lyric/baidu/BaiduLyricHelper.class
	LyricApi/bin/com/osmondy/kkdt/business/lyric/gecime/AlbumInfo.class
	LyricApi/bin/com/osmondy/kkdt/business/lyric/gecime/GeCiMeLyricParser.class
	LyricApi/bin/com/osmondy/kkdt/business/lyric/qq/QQLyricHelper.class
	LyricApi/bin/com/osmondy/kkdt/business/lyric/qq/QQLyricParser.class
unknown
test