safe string
Merge branch 'master' of https://github.com/panchipandol/lacalleweb

Conflicts:
	templates/web/carousel.html
	templates/web/indexcarrousel.html