use ENV.uploadUrl everywhere. autocorrect some common errors
Merge branch 'develop'