Merge branch 'develop'

SickBeard.py

gui/slick/images/providers/nzbs2go.png

gui/slick/images/providers/nzbs2go_com.png

gui/slick/images/providers/nzbtor.png

gui/slick/images/providers/nzbtor_cr.png

gui/slick/images/providers/sixbox.png

gui/slick/images/providers/sixbox_me.png

gui/slick/images/subtitles/flags/afr.png

gui/slick/images/subtitles/flags/amh.png

gui/slick/images/subtitles/flags/ara.png

gui/slick/images/subtitles/flags/arg.png

gui/slick/images/subtitles/flags/asm.png

gui/slick/images/subtitles/flags/ave.png

gui/slick/images/subtitles/flags/aym.png

gui/slick/images/subtitles/flags/aze.png

gui/slick/images/subtitles/flags/bak.png

gui/slick/images/subtitles/flags/bam.png

gui/slick/images/subtitles/flags/bel.png

gui/slick/images/subtitles/flags/ben.png

gui/slick/images/subtitles/flags/bis.png