Merge origin/master

Conflicts:
	backend/app/views/propiedad/detallePropiedad.php
Merge origin/master