still trying to fix upload folder tracking
i thought i added this already...
Merge branch 'master' into dev