old chang
Merge branch 'master' of https://github.com/zhang1989sh/Market

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