更改注册页面
Merge branch 'master' of https://github.com/pffair/wjw

Conflicts:
	AndroidManifest.xml
	src/com/pangff/wjw/fragment/AccountFragment.java