1.9 xiawu
Merge branch 'master' of https://github.com/wzhen22/JDshoppingItem

Conflicts:
	JDshoppingItem.xcodeproj/project.pbxproj
dsfaf