修改注册页面topbar右上角的控件查询问题
Merge branch 'master' of
https://github.com/remembergrace-dev/jituofu_android.git

Conflicts:
	2.0/bin/classes.dex
	2.0/bin/resources.ap_