Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' - fixes nzb uploads via new nzb-matrix.eu
Merge branch 'develop': bugfix to add .nzb to downloaded nzbs so nzbget finds them
Remove 5000 since the category selection is OR
Rails to 3.2.11 courtesy of CVE-2013-0156
Merge branch 'develop': redo jukebox layout and implement library filtering
Merge branch 'develop' with filtering bugfix
Merge branch 'develop': responsive css
Improve hot display on home page now that we're responsive
Stylesheet fix for deliveries
Allow zip files of nzbs to be uploaded
Downgrade Sofa because the new version doesn't have a lib directory
Fix and log zip extraction
Tag each request with a uuid and the user id
Merge branch 'master' into develop - pulls in sofa bugfixes