event can now handle arguments
Merge branch 'eventchange' of github.com:bachelor-2014/code into eventchange