#57623238 - File/Folder picker
Merge branch 'master' of github.com:devrandom/geebox
#57623238 - File/Folder - rename
Merge branch 'master' into gradle