自动登录设置，自定义控件测试
Merge branch 'v2Dev' of https://github.com/hjin1987/code.git into v2Dev

Conflicts:
	res/layout/activity_main.xml