player
Merge branch 'master' of https://github.com/nightwolf-chen/DoubanFM_IOS

Conflicts:
	DoubanFM.xcodeproj/project.xcworkspace/xcshareddata/DoubanFM.xccheckout