修改
Merge remote-tracking branch 'origin/master' into chenyan
。
修改删除
Merge branch 'chenyan'
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/async/AsyncDeleteUserInfoTask.java
	src/com/chainton/pdmclient/utils/Settings.java