Merge pull request #48 from BancDelTempsDAW/Carles

Carles
Oscar: Favicon
Merge branch 'master' into Oscar
Merge pull request #49 from BancDelTempsDAW/Oscar

Oscar
Merge branch 'master' into Carles