2014-06-04 17:49 by hongxiaolong
1、增加登录、注册的校验机制，增加注销功能；
Merge pull request #1 from gcliupeng/master

2014-06-04 20:56 by liupeng
增加商家列表。
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes.dex
	bin/resources.ap_
	bin/xiaofanzhuo-xiaolonginfo.apk
	src/com/xiaolong/xiaofanzhuo/enteractivity/ZoneShowActivity.java
2014-06-10 14:5 by hongxiaolong
小饭桌用户端v1.0_build0610.apk 
添加home返回功能，修改购物车清空后返回至菜单页。
Merge pull request #1 from xiaolonginfo/master

liupeng