goods image
Merge branch 'master' of https://github.com/toutou1985/imarket

Conflicts:
	ios/IMarket/View2/CXYFollowTableViewCell.h
	ios/IMarket/View2/CXYFollowViewController.m
	ios/nearlyMarket/CXYMarketListViewController.m