Merge branch 'develop'

gui/slick/interfaces/default/displayShow.tmpl

sickbeard/clients/__init__.py

sickbeard/clients/deluge_client.py

sickbeard/clients/download_station_client.py

sickbeard/clients/generic.py

sickbeard/clients/qbittorrent_client.py

sickbeard/clients/rtorrent_client.py

sickbeard/clients/transmission_client.py

sickbeard/clients/utorrent_client.py

sickbeard/tv.py