Test

Signed-off-by: Novel608 <2635324024@qq.com>
Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/WaiterClient.apk
	bin/classes.dex
	bin/resources.ap_
	gen/com/example/waiterclient/R.java
	res/layout/activity_login.xml
	res/layout/brower_order_list_item.xml
	res/layout/checkout.xml
	res/values/strings.xml
	src/com/jiaqiang/waiterclient/BrowerOrderActivity.java
	src/com/jiaqiang/waiterclient/LoginActivity.java
	src/com/jiaqiang/waiterclient/OrderActivity.java
	src/com/jiaqiang/waiterclient/entity/Dishes.java