Merge branch 'develop'

gui/slick/images/network/rdi.png

gui/slick/views/inc_defs.mako

lib/subliminal/__init__.py

lib/subliminal/api.py

lib/subliminal/cache.py

lib/subliminal/cli.py

lib/subliminal/converters/addic7ed.py

lib/subliminal/converters/tvsubtitles.py

lib/subliminal/exceptions.py

lib/subliminal/providers/__init__.py

lib/subliminal/providers/addic7ed.py

lib/subliminal/providers/opensubtitles.py

lib/subliminal/providers/podnapisi.py

lib/subliminal/providers/thesubdb.py

lib/subliminal/providers/tvsubtitles.py

lib/subliminal/score.py

lib/subliminal/subtitle.py

lib/subliminal/video.py

lib/tvdb_api/tvdb_api.py

sickbeard/helpers.py