Merge remote-tracking branch 'remotes/upstream/ThePirateBay' into ThePirateBay

Conflicts:
	gui/slick/interfaces/default/config_search.tmpl > Fixed
Merge pull request #5 from jeroenvds/ThePirateBay

Upstream merge of mr-orange/Sick-Beard/ThePirateBay