improve url uploader
fix tests
Merge branch 'master' into FinalUserProfile
Merged master