Merge branch 'develop'

SickBeard.py

gui/slick/js/core.js

gui/slick/js/core.min.js

gui/slick/views/addShows.mako

gui/slick/views/addShows_recommendedShows.mako

gui/slick/views/addShows_trendingShows.mako

gui/slick/views/config_notifications.mako

gui/slick/views/config_providers.mako

gui/slick/views/config_subtitles.mako

gui/slick/views/displayShow.mako

gui/slick/views/inc_blackwhitelist.mako

gui/slick/views/manage.mako

gui/slick/views/manage_manageSearches.mako

gui/slick/views/manage_massEdit.mako

gui/slick/views/restart.mako

gui/slick/views/trendingShows.mako

lib/certifi/__init__.py

lib/certifi/cacert.pem

lib/certifi/core.py

lib/certifi/old_root.pem