Stampa
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	fonts/stampa-webfont/Stampa.svg
Actualización
Merge branch 'master' into develop