fetch files via files.js collection rather than service.js
Merge branch 'ray'