临时提交
Merge branch 'master' of https://github.com/poorevil/InstoreApp

Conflicts:
	InstoreApp/View/StoreDetail_detailCell.m