uploads now go to documents/uploads
Merge remote-tracking branch 'origin/master' into processedList