Merge pull request #15 from xq831205gjf/master

1.9 morning- UPdate
Merge pull request #17 from xq831205gjf/master

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

Conflicts:
	JDshoppingItem.xcodeproj/project.pbxproj
dsfaf
dfaf
1.10 morning
gaidongIP
1.10 zhouqin
Merge pull request #19 from zhouqin0414/master

1.10 zhouqin
common
Merge pull request #1 from wzhen22/master

1.10 morning