[tx-robot] updated from transifex
Merge remote-tracking branch 'upstream/develop' into reliable_uploads
now upload works again as good (or as bad) as before.

check FileUploadService.java:

            //How does this work? Is it thread-safe to set mCurrentUpload here?
            //What happens if other mCurrentUpload is currently in progress?
            //
            //It seems that upload does work, however the upload state is not set
            //back of the first upload when a second upload starts while first is
            //in progress (yellow up-arrow does not disappear of first upload)