Merge branch 'develop' into feature/cambio_de_assets
Windows has now the same resolution
Merge branch 'feature/cambio_de_assets' into develop