食客突出显示当前订单，历史订单灰色
订单cell中重复显示店铺名多余
Merge branch 'master' of https://github.com/i0xbean/lingdang

Conflicts:
	ios/lingdang/controller/admin/BXOrderListViewController.xib
	ios/lingdang/data/model/BXOrder.m
Merge branch 'master' of https://github.com/i0xbean/lingdang