Minor changes to BasicEvent
Merge branch 'master-dev' of https://github.com/foxhide/PKSU-Gruppearbejde into master-dev