Update Event Description
Update Event Description
Merge branch 'master' of https://github.com/hillarylacida/scheduler

Conflicts:
	target/classes/resources.class