Merge branch 'development' of
https://github.com/Pistachitos/Sick-Beard.git into Pistachitos
Fix passing wrong parameter to logSubtitles
Merge remote-tracking branch 'pistachitos/Pistachitos' into pistachitos-master

Conflicts:
	gui/slick/css/default.css
	gui/slick/interfaces/default/apiBuilder.tmpl
	gui/slick/interfaces/default/config_providers.tmpl
	gui/slick/interfaces/default/history.tmpl
	gui/slick/interfaces/default/home.tmpl
	gui/slick/interfaces/default/inc_qualityChooser.tmpl
	sickbeard/__init__.py
	sickbeard/common.py
	sickbeard/databases/mainDB.py
	sickbeard/metadata/__init__.py
	sickbeard/versionChecker.py
	sickbeard/webserve.py