fade e minor fixes no som
Merge remote-tracking branch 'origin/gota1' into gota1