Conflicts:
	XFFruit/Controllers/HTTPController/ICRHTTPController.m
	XFFruit/ViewControllers/Business/BusinessViewController.m
	XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
	XFFruit/ViewControllers/Survey/controllers/ChooseProductViewController.m