File browser
Merge pull request #94 from ldjagger/1.2-dev

File browser