Merge branch 'develop'

.build/bower.json

gui/slick/css/dark.css

gui/slick/css/light.css

gui/slick/css/style.css

gui/slick/images/network/13th street.png

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

gui/slick/images/network/33.png

gui/slick/images/network/3fm.png

gui/slick/images/network/3sat hd.png

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

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

gui/slick/images/network/7mate.png

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

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

gui/slick/images/network/abc australia.png

gui/slick/images/network/abc news 24.png

gui/slick/images/network/abc tv australia.png

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

gui/slick/images/network/adult-swim.png

gui/slick/images/network/adultswim.png