edit regular event added
Merge branch 'master' of https://github.com/ustcomp3111/comp3111project

Conflicts:
	WeUnion/bin/WeUnion.apk
	WeUnion/bin/classes.dex
	WeUnion/bin/classes/com/example/weunion/Global.class
	WeUnion/bin/classes/com/example/weunion/WeeklyAgenda$1$1.class
	WeUnion/bin/classes/com/example/weunion/WeeklyAgenda$1.class
	WeUnion/bin/classes/com/example/weunion/WeeklyAgenda.class
	WeUnion/src/com/example/weunion/Global.java
	WeUnion/src/com/example/weunion/WeeklyAgenda.java
Revert "Merge branch 'master' of https://github.com/ustcomp3111/comp3111project"

This reverts commit 25c5b392d161386fa0d7b0dbd658b5993e85bdf0.
Revert "edit regular event added"

This reverts commit 3ab1aa753e940ca4f6d9d4313efd566227b93019.
Merge branch 'master' of https://github.com/ustcomp3111/comp3111project