Merge branch 'develop'

gui/slick/images/network/national geographic.png

gui/slick/images/network/ngc.png

gui/slick/images/network/niconico.png

gui/slick/images/network/nonetwork.png

gui/slick/images/network/sky sport news.png

gui/slick/images/network/sony entertainment television.png

gui/slick/images/network/sveriges television.png

gui/slick/images/network/thames television.png

gui/slick/interfaces/default/config_general.tmpl

gui/slick/interfaces/default/config_notifications.tmpl

gui/slick/interfaces/default/config_postProcessing.tmpl

gui/slick/interfaces/default/config_subtitles.tmpl

gui/slick/interfaces/default/displayShow.tmpl

gui/slick/interfaces/default/editShow.tmpl

gui/slick/interfaces/default/home.tmpl

gui/slick/interfaces/default/home_newShow.tmpl

gui/slick/interfaces/default/inc_top.tmpl

gui/slick/interfaces/default/viewlogs.tmpl

gui/slick/js/configNotifications.js

gui/slick/js/displayShow.js