merge

Merge branch 'Pistachitos' of https://github.com/mr-orange/Sick-Beard into Pistachitos

Conflicts:
	sickbeard/providers/torrentday.py
merge
Merge branch 'Pistachitos' of https://github.com/vandalon/Sick-Beard into Pistachitos

Conflicts:
	sickbeard/providers/torrentday.py