Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmclient/LoginActivity.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
修改注销并勾选清楚数据后缺少一个提示框
邮箱右侧图片
Add gen folder to gitignore.
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
修改注销并勾选清楚数据后缺少一个提示框
Merge branch 'chenyan' of https://github.com/chainton/pdm-client.git into chenyan
Merge branch 'chenyan'
Merge branch 'chenyan' of https://github.com/chainton/pdm-client.git
into chenyan
Merge branch 'chenyan' of https://github.com/chainton/pdm-client.git into chenyan
Merge branch 'chenyan'
判断外网加了判断openfir的连接状态
Merge branch 'chenyan'
修改
修改外网判断
Merge branch 'chende' of https://github.com/chainton/pdm-client.git into
chende