Forgot to switch branch
Merge branch 'mediaelement'
Changed soundmanager to not prefer flash