Merge branch 'junalmeida_torrents/torrent_1080_subtitles'

Conflicts:
	sickbeard/__init__.py
	sickbeard/providers/generic.py
	sickbeard/search_queue.py
	sickbeard/showUpdater.py
	sickbeard/tv.py
	sickbeard/webserve.py