cleanup
Merge branch 'master' into sound
now makes use of icatstatelistener
Merge branch 'sound'
Merge branch 'master' of https://github.com/Lusito/GameDevWeek