本地提交
本地提交
Merge branch 'master' of https://github.com/AAATEAM/ea/

Conflicts:
	ea-core/.classpath
	ea-template/.classpath
	ea-template/src/test/java/com/acme/WebSocketChatServlet.java
本地提交