Merge branch 'develop' v4.0.18

.travis.yml

CHANGES.md

gui/slick/css/dark.css

gui/slick/css/light.css

gui/slick/css/style.css

gui/slick/images/network/abc (us).png

gui/slick/images/network/fox (us).png

gui/slick/images/network/kids station.png

gui/slick/images/network/kyoto broadcasting system.png

gui/slick/images/network/mtv (us).png

gui/slick/images/network/showcase (ca).png

gui/slick/images/network/toei channel.png

gui/slick/images/network/tv kanagawa.png

gui/slick/interfaces/default/config_general.tmpl

gui/slick/interfaces/default/config_notifications.tmpl

gui/slick/interfaces/default/displayShow.tmpl

gui/slick/interfaces/default/editShow.tmpl

gui/slick/interfaces/default/home.tmpl

gui/slick/interfaces/default/home_addShows.tmpl

gui/slick/interfaces/default/home_newShow.tmpl