Include default local upload directory. Fixes #14
Merge branch 'dev'