eventtimer and game event design
Merge branch 'origin/master'