UI整合
Merge branch 'master' into echo_local

Conflicts:
	ea-template/.classpath
添加对用户的名字和密码非空的判断
金钱游戏手机端UI优化
Merge branch 'echo_local'
Merge branch 'master' into local