美化界面
美化界面
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/res/layout/login.xml