resolving merge conflict.
uploading working again. still working on background thread processing of thumbnails.