files list
Merge branch 'master' of github.com:UnissonCo/filer

Conflicts:
	views/file-list.html
merged from master