Carles: per si de cas
Merge branch 'master' into Carles
Carles: coses arreglades
Merge pull request #53 from BancDelTempsDAW/Carles

Carles