Merge remote-tracking branch 'upstream/Pistachitos' into Pistachitos

Conflicts:
	gui/slick/interfaces/default/inc_top.tmpl
	sickbeard/__init__.py