Panel left upload
Merge branch 'master' of github.com:UnissonCo/filer

Conflicts:
	index.html
	views/file-preview.html