Merge remote-tracking branch 'origin/develop' into develop

.idea/deploymentTargetSelector.xml

...gadodepintia/exploradoresDePintia/ExploradoresDePintia.kt

...llegadodepintia/exploradoresDePintia/model/LayoutUtils.kt

app/src/main/res/drawable/asi_minijuego_4_bola1.png

app/src/main/res/drawable/asi_minijuego_4_bola2.png

app/src/main/res/drawable/asi_minijuego_4_tablero.png

app/src/main/res/drawable/style_barra_energia.xml

app/src/main/res/drawable/style_texto2_border.xml

app/src/main/res/layout/activity_exploradores_de_pintia.xml

app/src/main/res/layout/modal_detalles_compra.xml

app/src/main/res/layout/modal_inventario.xml