首页布局调整
Merge branch 'echo_local'

Conflicts:
	ea-template/log_login.txt
	ea-template/src/main/webapp/home.ftl
Merge branch 'local'

Conflicts:
	ea-template/log_login.txt