Local e Inquilino

:)
Merge remote-tracking branch 'origin/Chris' into Manu
Merge remote-tracking branch 'origin/Manu' into Chris