Updates

Removed service executor and handling execution appropriately.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/event/EventHandler.java
	src/main/java/event/cache/Cache.java