Merge branch 'staging' into correcting458_file_upload
fix uploading to subfolder results in uploading to root error (#458)
Merge branch 'correcting458_file_upload' into develop