meage licheng, change nothing
选择餐桌
Merge remote-tracking branch 'origin/lichen' into ccs

Conflicts:
	src/com/crazy/easy/order/MainActivity.java
	src/com/crazy/easy/order/OrderController.java
	src/com/crazy/easy/order/page/OrderPage.java
菜单详情页面添加桌号显示