UI整合
Merge branch 'master' into echo_local

Conflicts:
	ea-template/.classpath
金钱游戏手机端UI优化
Merge branch 'echo_local'