Merge remote-tracking branch 'origin/master'

# Conflicts:
#	TELEVISION.md

TELEVISION.md

@@ -48,7 +48,7 @@
 | GOL Play | - | [web](https://www.goltelevision.com/en-directo) | [logo](https://graph.facebook.com/goltv.es/picture?width=200&height=200) | GOL.TV | W3U,EXTA |
 | Esport 3 | [m3u8 # GEOCAT](https://directes-tv-cat.ccma.cat/live-origin/esport3-hls/master.m3u8) - [m3u8 # GEO](https://directes-tv-es.ccma.cat/live-origin/esport3-hls/master.m3u8) | [web](https://www.ccma.cat/3cat/directes/esport3/) | [logo](https://graph.facebook.com/Esport3/picture?width=200&height=200) | E3.TV | - |
 | ETB Deportes | [m3u8](https://multimedia.eitb.eus/live-content/oka1hd-hls/master.m3u8) - [m3u8 # 2](https://multimedia.eitb.eus/live-content/oka2hd-hls/master.m3u8) - [m3u8 # 3](https://multimedia.eitb.eus/live-content/oka3hd-hls/master.m3u8) | [web](https://www.eitb.eus/es/deportes/deporte-en-directo/) | [logo](https://graph.facebook.com/deportes.eitb.kirolak/picture?width=200&height=200) | ETBD.TV | - |
-| Aragón Deporte | [m3u8](https://cartv-streaming.aranova.es/hls/live/adeportes_deporte1.m3u8) - [m3u8 # 2](https://cartv.streaming.aranova.es/hls/live/adeportes_deporte2.m3u8) - [m3u8 # 3](https://cartv.streaming.aranova.es/hls/live/adeportes_deporte3.m3u8) - [m3u8 # 4](https://cartv.streaming.aranova.es/hls/live/adeportes_deporte4.m3u8) - [m3u8 # 5](https://cartv.streaming.aranova.es/hls/live/adeportes_deporte5.m3u8) - [twitch](https://player.twitch.tv/?channel=aragondeporte&parent=tdtchannels.com&parent=www.tdtchannels.com) | [web](https://www.cartv.es/aragondeporte/directo) | [logo](https://graph.facebook.com/aragondeporte/picture?width=200&height=200) | AragonD.TV | - |
+| Aragón Deporte | [m3u8 # 1](https://cartv-streaming.aranova.es/hls/live/adeportes_deporte6.m3u8) - [m3u8 # 2](https://cartv-streaming.aranova.es/hls/live/adeportes_deporte5.m3u8) - [twitch](https://player.twitch.tv/?channel=aragondeporte&parent=tdtchannels.com&parent=www.tdtchannels.com) | [web](https://www.cartv.es/aragondeporte/directo) | [logo](https://graph.facebook.com/aragondeporte/picture?width=200&height=200) | AragonD.TV | - |
 | Vinx TV Asturias | [m3u8](https://tv.radiocast.es:5443/vinxtv/streams/vinxtvlive.m3u8) - [youtube](https://www.youtube.com/channel/UCJDjXO0kv_ZOtLntIO0d4bw/live) | [web](https://vinxtv.es/en-directo/) | [logo](https://graph.facebook.com/VinxTV/picture?width=200&height=200) | - | EMB |
 | IB3 Esports | [youtube](https://www.youtube.com/channel/UCOmWJETLyAlFrHkmccOQ-3w/live) | [web](https://ib3.org/directe) | [logo](https://graph.facebook.com/EsportsIB3/picture?width=200&height=200) | - | EMB |
 | Real Madrid TV | [m3u8 # ES](https://rmtv.akamaized.net/hls/live/2043153/rmtv-es-web/master.m3u8) - [m3u8 # EN](https://rmtv.akamaized.net/hls/live/2043154/rmtv-en-web/master.m3u8) - [twitch](https://player.twitch.tv/?channel=realmadrid&parent=tdtchannels.com&parent=www.tdtchannels.com) | [web](https://www.realmadrid.com/real-madrid-tv) | [logo](https://graph.facebook.com/RealMadrid/picture?width=200&height=200) | RMTV.TV | - |
@@ -176,7 +176,7 @@
 | CanalCosta | [m3u8](https://5d8d85cf2c308.streamlock.net:1936/CanalcostaTV/endirecto/playlist.m3u8) | [web](https://www.canalcostatv.es) | [logo](https://graph.facebook.com/canalcosta/picture?width=200&height=200) | CanalCosta.TV | - |
 | Uvitel TV | - | [web](https://www.uvitel.tv/directo/) | [logo](https://graph.facebook.com/uviteltv/picture?width=200&height=200) | - | W3U,EMB,EXTA |
 | Interalmería TV | [m3u8](https://tv.interalmeria.tv/directo/live.m3u8) | [web](https://www.interalmeria.tv/directo/) | [logo](https://graph.facebook.com/Interalmeriatv/picture?width=200&height=200) | InterAlmeria.TV | - |
-| Tuya La Janda TV | [m3u8](https://cloudvideo.servers10.com:8081/8176/index.m3u8) | [web](https://tuyatv.com/directo/) | [logo](https://graph.facebook.com/tuyalajandatv/picture?width=200&height=200) | - | - |
+| Tuya La Janda TV | [m3u8](https://vdo.grupolimalive.com:3847/live/tuyatvlive.m3u8) | [web](https://tuyatv.com/directo/) | [logo](https://graph.facebook.com/tuyalajandatv/picture?width=200&height=200) | - | - |
 | Más Jerez | [youtube](https://www.youtube.com/channel/UCOoSrqLzlo_S5yQK3OmFqWw/live) | [web](https://masjerez.com/programas-tv) | [logo](https://graph.facebook.com/masjerez/picture?width=200&height=200) | - | EMB |
 | TV Centro Andalucía | [m3u8](https://video0.rogohosting.com:19360/8050/8050.m3u8) | [web](https://tvcentroandalucia.com) | [logo](https://graph.facebook.com/TVCentroAndalucia/picture?width=200&height=200) | - | NONAV |
 | Canal San Roque | [m3u8](https://cdnlivevlc.codev8.net/aytosanroquelive/smil:channel1.smil/playlist.m3u8) | [web](https://tv.multimediasanroque.com/videos/12315-san-roque-directo) | [logo](https://yt3.googleusercontent.com/tV-0_Cp9qnamXNVbcuRx3F_9UvUt1s3_ieQmV3RRaF50bHpZIlyLZn4iHYmL32lsz1Zv_ZmFHA=s200) | - | - |