Merge branch 'master' into patch-112

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/pe.m3u

@@ -76,7 +76,7 @@ https://video.obslivestream.com/gtv/index.m3u8
 #EXTINF:-1 tvg-id="HatunTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://yt3.ggpht.com/ytc/AAUvwnhI0HKESXrVQ8-ktPCeRap6-cP_4upPtEpAlwPa=s88-c-k-c0x00ffffff-no-rj" group-title="Music",Hatun TV (720p) [Not 24/7]
 https://tv.siete.us/bestcablehatuntv/bestcablehatuntv/index.m3u8
 #EXTINF:-1 tvg-id="HuachoPerúTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/huachotvperu/picture?width=320&height=320" group-title="Local",Huacho Perú TV [Not 24/7]
-https://tv.siete.us/hchoperutv/hchoperutv/index.m3u8
+https://rtmp02.portalexpress.es/hchoperutv/hchoperutv/playlist.m3u8
 #EXTINF:-1 tvg-id="HuanucoenVivo.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/huanucoenvivo/picture?width=320&height=320" group-title="Local",Huánuco en Vivo [Not 24/7]
 https://cp.sradiotv.com:1936/8006/8006/playlist.m3u8
 #EXTINF:-1 tvg-id="IdentidadTV.pe" tvg-country="PE" tvg-language="Spanish" tvg-logo="https://graph.facebook.com/IDENTIDADTVOFICIAL/picture?width=320&height=320" group-title="News",Identidad TV [Not 24/7]
@@ -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]