完成修改菜品名称，菜品奉送，菜品退菜，折让四部分的ui显示
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml