Updated soundmanager
Resolved conflict
Merge branch 'master' of https://github.com/sirlantis/ggj2013