finish 3 layout files
完成了前台收银activity的布局
merge lskobe to dev
connected functions together
modify some ui and add two xml files
new order xml completed
merge remote developers code
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev
modify new_order_activity ui
完善了修改单价，修改数量，修改促销员，加单的ui，且增加了修改整单做法和单菜做法
把跟台有关的布局换成了dialog风格，并为他们设置了margin
merge dev to remote dev
fixed #4 and add Toast Utils
添加修改人数，修改服务员，服务率折扣选择，单品折扣，菜品转台的显示
实现了一部分消费明细查看的主界面布局，还差右面比较复杂的一小块
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev

Conflicts:
	res/values/strings.xml
完成修改菜品名称，菜品奉送，菜品退菜，折让四部分的ui显示
fixed #5 and fixed some bugs
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
把前台设置已经写好的Activity放到了一个新的单独的子包中