Friend System
Merge branch 'master' of https://github.com/ustcomp3111/comp3111project

Conflicts:
	WeUnion/bin/classes/com/example/weunion/EventInfo.class