修改了从首页直接进入商铺详情以及购物车的bug
Merge branch 'master' of https://github.com/BIT-TaoXue/TaoXue-iOS

Conflicts:

TaoXue.xcodeproj/project.xcworkspace/xcuserdata/gzw.xcuserdatad/UserInte
rfaceState.xcuserstate
	TaoXue/Base.lproj/Main.storyboard
	TaoXue/ShoppingCartViewController.m
	TaoXue/StoreDetailViewController.m