added ruff music fading
Merge branch 'master' into sound