Fixed save paths in uploader.
avoid 404 with redirect
Merge remote-tracking branch 'origin/dev'