switched Upload to the 2.0 codebase
updated submodule references
reset the main request after a not-found exception