File uploads now working with file-model directive
Merge branch 'file-uploads'