Fixed a few leftover issues from cleaning up the Event class
Merge branch 'dev' into server_database_dev