Merge pull request #543 from pierrebeitz/master

Pagination on files#index, fixes #303
small tweaks to files