Merge branch 'master' into patch-114

channels/cr.m3u

@@ -35,6 +35,8 @@ https://cp.sradiotv.com:1936/8034/8034/playlist.m3u8
 http://livestreamcdn.net:1935/ExtremaTV/ExtremaTV/playlist.m3u8
 #EXTINF:-1 tvg-id="ExtremaTV.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i0.wp.com/unored.tv/wp-content/uploads/2018/03/Extrema-TV-portal-Unored-1.png" group-title="",Extrema TV (720p)
 https://www.livestreamcdn.net:444/ExtremaTV/ExtremaTV/playlist.m3u8
+#EXTINF:-1 tvg-id="Humor247.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/https://www.facebook.com/humor247cr/picture?width=320&height=320" group-title="Entertainment",Humor 24-7
+https://srv.panelcast.net/humor247/humor247/playlist.m3u8
 #EXTINF:-1 tvg-id="HBTVTicaVision.cr" tvg-country="CR" tvg-language="" tvg-logo="https://yt3.ggpht.com/-k5QO6YHdanw/AAAAAAAAAAI/AAAAAAAAAAA/UTcqO9gj0z0/s900-c-k-no-mo-rj-c0xffffff/photo.jpg" group-title="",HBTV TicaVisión (1080p)
 http://k3.usastreams.com:1935/HBTV/HBTV/playlist.m3u8
 #EXTINF:-1 tvg-id="QuinceUCR.cr" tvg-country="CR" tvg-language="Spanish" tvg-logo="https://i.imgur.com/7hRnPcP.png" group-title="",Quince UCR (Universidad de Costa Rica) (720p) [Not 24/7]

channels/ec.m3u

@@ -15,5 +15,7 @@ https://api.new.livestream.com/accounts/1359588/events/4428723/live.m3u8
 https://59c3c7bda15f4.streamlock.net:444/universal/smil:universal.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="UCSG.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="https://i.imgur.com/otOhIe8.png" group-title="",UCSG (1080p) [Not 24/7]
 http://ecuastreamhd.com:1935/UCSGHQ/UCSGHQ/chunklist.m3u
-#EXTINF:-1 tvg-id="ZaracayTV.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="Local",Zaracay TV (720p)
+#EXTINF:-1 tvg-id="WuanPlus.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/WuanPlus/picture?width=320&height=320" group-title="General",Wuan+
+https://streamingwowza.com:1936/wuanplus/wuanplus/playlist.m3u8
+#EXTINF:-1 tvg-id="ZaracayTV.ec" tvg-country="EC" tvg-language="Spanish" tvg-logo="" group-title="Local",Zaracay TV
 https://streamingwowza.com:1936/zaracaytv/smil:zaracaytv.smil/playlist.m3u8

channels/pe.m3u

@@ -221,7 +221,7 @@ https://tvdatta.com:3952/live/rwtelevisionlive.m3u8
 #EXTINF:-1 tvg-id="SelvaMiaTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/103910101231367/picture?width=320&height=320" group-title="Local",SelvaMía TV (Aguaytía) [Not 24/7]
 https://inliveserver.com:1936/18022/18022/playlist.m3u8
 #EXTINF:-1 tvg-id="Sistema1.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/sistema1tv/picture?width=320&height=320" group-title="Local",Sistema 1 (Huaraz) (720p) [Not 24/7]
-https://tv.siete.us/sistema1/sistema1/index.m3u8
+https://rtmp02.portalexpress.es/sistema1tv/sistema1tv/playlist.m3u8
 #EXTINF:-1 tvg-id="SolStereoTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/solstereotvcasma/picture?width=320&height=320" group-title="Local",Sol Stereo TV (Casma) [Not 24/7]
 https://stmv.panel.grupolimalive.com/solstereotv/solstereotv/playlist.m3u8
 #EXTINF:-1 tvg-id="SolarTelevision.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/TELEVISIONSOLAR/picture?width=320&height=320" group-title="Local",Solar Televisión (Abancay) [Not 24/7]
@@ -296,7 +296,7 @@ https://cp.sradiotv.com:1936/8078/8078/playlist.m3u8
 #EXTINF:-1 tvg-id="UniversitariaTVChanchamayo.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/universitariatvchanchamayo/picture?width=320&height=320" group-title="Local",Universitaria TV (Chanchamayo) (480p) [Not 24/7]
 https://tvdatta.com:3670/live/universitariatvlive.m3u8
 #EXTINF:-1 tvg-id="UranioTVYurimaguas.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/uraniotv/picture?width=320&height=320" group-title="Local",Uranio TV (Yurimaguas) (720p) [Not 24/7]
-https://tv.siete.us/uraniotv/uraniotv/index.m3u8
+https://rtmp02.portalexpress.es/uraniotv/uraniotv/playlist.m3u8
 #EXTINF:-1 tvg-id="USILTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/usiltv/picture?width=320&height=320" group-title="General",USIL TV [Not 24/7]
 https://video.produccionesmagicorp.com/redes/video.m3u8
 #EXTINF:-1 tvg-id="USMPTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/USMPTV/picture?width=320&height=320" group-title="Culture",USMPTV [Not 24/7]

channels/us.m3u

@@ -1799,6 +1799,10 @@ https://voa-lh.akamaihd.net/i/voapnn_7@72817/master.m3u8
 https://voa-lh.akamaihd.net/i/voa_mpls_tvmc3_3@320295/master.m3u8
 #EXTINF:-1 tvg-id="VoATV.us" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9A6LZ7z.jpg" group-title="News",VoA TV (1080p)
 https://voa-lh.akamaihd.net/i/voa_mpls_tvmc6@320298/master.m3u8
+#EXTINF:-1 tvg-id="VallenatoInternacional.us" tvg-country="US;LATAM" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/valleinalradio/picture?width=320&height=320" group-title="Music",Vallenato Internacional
+https://59a564764e2b6.streamlock.net/vallenato/Vallenato2/playlist.m3u8
+#EXTINF:-1 tvg-id="SoniderosTV.us" tvg-country="US;MX" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/www.sonideros.tv/picture?width=320&height=320" group-title="Music",Sonideros TV
+https://tv2.fastcast4u.com:3728/live/soniderostvlive.m3u8
 #EXTINF:-1 tvg-id="VSiN.us" tvg-country="US" tvg-language="" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/VSiN_400x400.png?raw=true" group-title="",VSiN (720p)
 https://stream.rcncdn.com/live/vsinproxy.m3u8
 #EXTINF:-1 tvg-id="WABITV.us" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/MsE05yj.jpg" group-title="Local",WABI 5 Bangor ME (WABI) (720p)