Merge branch 'auto_redirect' of https://github.com/xombiemp/Sick-Beard
Updated https support to allow either HTTP or HTTPS but not both at once.
Merge branch 'master' of github.com:midgetspy/Sick-Beard
Merge pull request #310 from cianmcgovern/newzbinfeedfix

Changed newzbin error string
Merge pull request #308 from thezoggy/ui-autocomplete_update

SB Autocomplete
Merge pull request #262 from BigCabbage/master

Metadata Support for Synology NAS
Merge pull request #210 from jiphex/handle-prowl-ssl-error

Very small fix to handle occasional SSL errors that Prowl seems to generate from time-to-time
Took the init.ubuntu script from technobrat's branch
Merge branch 'master' of https://github.com/smithjw/Sick-Beard
Cleaned up the BTN provider, fixed the icon and link
Catch prowl errors in a way that works on 2.5 as well.
Add maxage support to the NZBMatrix provider
Merge branch 'patch-1' of https://github.com/mila76/Sick-Beard
Fixed some small things in the WDTV metadata provider as well as the line endings
Leave sbHttpsPort in the webserve so restart doesn't break
Fix the XBMC notifier to use the correct flag so that the Plex notifier isn't used unnecessarily
Tweaked the way HTTPS works when it can't create a certificate for you.
Added support for all types of x264 SD releases
Added some error catching so updating from a pre-SSL version doesn't throw a 500 on restart
Fix a merge issue with the ubuntu init script