Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	sickbeard/webapi.py
Fixed WebAPI - Code needed re-doing to intergrate properly with new WebUI code.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	sickbeard/webapi.py