ISSUE#316. Updated to handle new file and directory uploads.
Merge branch 'current-sprint' into 313-file-events