merge
Merge commit '9339f2289765ae8d5ca22cc05f854bfc2a10f4d3'

Conflicts:
	BaiduMusic/WDBaiduSongListController.m
	BaiduMusic/WDSongInfo.m