Merge remote-tracking branch 'origin/master' into Carles
Carles: Arreglada relacio servei persona
Merge pull request #10 from BancDelTempsDAW/Carles

Carles
Merge remote-tracking branch 'origin/master' into Ricard