登陆模块
Merge branch 'master' of https://github.com/linghp/examvip.git

Conflicts:
	res/layout/main_tab_more.xml
	res/values/strings.xml