Fixed some issues with Directory uploads
Merge branch 'master' of https://github.com/Sandldan/savethemark