修改token获取,修改密码跳转
s
Merge branch 'service' of https://github.com/liuwenlong/zero into service

Conflicts:
	src/com/mapgoo/zero/api/GlobalNetErrorHandler.java
修改列表图片
增加升级检测
Merge branch 'volunteer' into service

Conflicts:
	src/com/mapgoo/zero/api/GlobalNetErrorHandler.java
	src/com/mapgoo/zero/ui/SettingsAboutActivity.java
modify versionname
modify versioncode
修改数据保存
data szve
Merge branch 'volunteer' into service

Conflicts:
	AndroidManifest.xml
修改json生成库