Moved the upload functionality from the pairing view to the upload view.
Merged some conflicts.