相关活动
Merge branch 'master' of https://github.com/wjling/Catherine.git

Conflicts:
	Catherine-master/src/com/app/ui/UserInterface.java
	Catherine-master/src/com/app/ui/menu/MyEvents/MyEvents.java
	Catherine-master/src/com/app/utils/HttpSender.java
	Catherine-master/src/com/app/utils/WebSocketUtil.java
Merge branch 'master' of https://github.com/wjling/Catherine.git