Closes #160 - Cannot save search settings due to invalid merge.
Merge branch 'torrentProviders' into torrent_1080_subtitles