Update Files // Hero
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/sthouch/api/listeners/CreateEvent.java
	src/org/sthouch/api/server/Server.java