test fixes
Merge branch 'eventsystem-2013' of github.com:wITTus/Brute-Force-Game-Engine into eventsystem-2013