对话框优化
Merge branch 'master' of https://github.com/ipetty/i-client

Conflicts:
	src/net/ipetty/android/register/RegisterActivity.java