Merge branch 'development' of
https://github.com/Pistachitos/Sick-Beard.git into Pistachitos
Fix passing wrong parameter to logSubtitles
Remove duplicate lines from merge
Merge Fix
CSS fix
Fix for subtitle language notification
Merge remote-tracking branch 'pistachitos/Pistachitos' into development

Conflicts:
	gui/slick/interfaces/default/config_providers.tmpl
	sickbeard/__init__.py
	sickbeard/metadata/__init__.py
	sickbeard/providers/__init__.py
	sickbeard/tv.py
	sickbeard/version.py
	sickbeard/webserve.py