Merge pull request #8 from BancDelTempsDAW/Carles

Carles
Merge remote-tracking branch 'origin/master' into Carles
Carles: Arreglada relacio servei persona