Merge branch 'develop'

.gitattributes

.gitignore

CHANGES.md

gui/slick/images/network/4sd.png

gui/slick/images/network/america one television network.png

gui/slick/images/network/america one.png

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

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

gui/slick/images/network/cnbc.png

gui/slick/images/network/comedy entral old.png

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

gui/slick/images/network/eredivisie live 1.png

gui/slick/images/network/eredivisie live 2.png

gui/slick/images/network/eredivisie live.png

gui/slick/images/network/esquire network.png

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

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

gui/slick/images/network/london weekend television (lwt).png

gui/slick/images/network/london weekend television.png

gui/slick/images/network/nat geo.png