Remove check on episode name formatting
Fix for if there is no zoneinfo File, but the network table is loaded
Removed conflicting code
Merge pull request #644 from Prinz23/no_zoneinfo_file_fix

Fix for if there is no zoneinfo File, but the network table is loaded
Fix Sabnzb issue #643
HomePage sort by active show first.
Merge branch 'Pistachitos' of https://github.com/mr-orange/Sick-Beard into ThePirateBay
Change left over single quotes to double quotes (itofzo)
Change xbmc __init__ to follow XBMC_12PLUS (itofzo)
Change import cElementTree fallback ElementTree (itofzo)
Metadata Fix AttributeError + genere check and add strip
Revert "Remove check on episode name formatting"

This reverts commit 530653f01ff467a56dc08c3c5ac573cc7cadd68b.
Merge branch 'Pistachitos' of https://github.com/mr-orange/Sick-Beard into ThePirateBay
Merge pull request #645 from randomous/Unit-test-conflicts

Removed conflicting code
Merge remote-tracking branch 'upstream/ThePirateBay' into ThePirateBay
Use transaction for search cache and request and use rageid for tntvillage provider
Update scc.py

Proper fix for SCC provider.
Merge pull request #655 from bwq/ThePirateBay

Update scc.py
Merge remote-tracking branch 'upstream/ThePirateBay' into ThePirateBay
Fix log text