Fixes xhr.upload event listeners
Fixes merge conflicts
Adds Editor.upload mocha specs
Merge branch 'fileupload-custom-action' into both_features