Making moves for resume upload.
Merge branch 'master' into local