did a lot of overhaul
Merge remote-tracking branch 'origin/braden' into gabis-gui

Conflicts:
	src/EditEvent.php