Merge branch 'develop'

gui/slick/images/network/cmt.png

gui/slick/images/network/national geographic channel.png

gui/slick/images/network/univision.png

gui/slick/interfaces/default/config_general.tmpl

gui/slick/interfaces/default/config_notifications.tmpl

gui/slick/interfaces/default/config_postProcessing.tmpl

gui/slick/interfaces/default/config_search.tmpl

gui/slick/interfaces/default/home_postprocess.tmpl

gui/slick/js/newShow.js

lib/rtorrent/lib/xmlrpc/requests_transport.py

lib/trakt/trakt.py

sickbeard/__init__.py

sickbeard/clients/rtorrent.py

sickbeard/config.py

sickbeard/helpers.py

sickbeard/logger.py

sickbeard/providers/alpharatio.py

sickbeard/providers/animenzb.py

sickbeard/providers/animezb.py

sickbeard/providers/bitsoup.py