Merge remote-tracking branch 'ms/development' into failed-download-handling

Conflicts:
	sickbeard/postProcessor.py
Merge remote-tracking branch 'ms/development' into failed-download-handling
Small style change

Explicit unicode for logger
Merge branch 'failed-download-handling' into development-custom