Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmclient/LoginActivity.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
注册邮箱右侧验证图片
验证图片
Add gen folder to gitignore.
Revert "Add gen folder to gitignore."

This reverts commit 4eccfc8845583fd3c5ef4873535744ed974582c6.
邮箱右侧图片
Add gen folder to gitignore.
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
Merge branch 'chenyan'
Merge branch 'chenyan'
判断外网加了判断openfir的连接状态
Merge branch 'chenyan'
修改