disabled upload button when upload starts
Merge branch 'master' of https://github.com/dimagi/commcare-hq into dim_img_upload_btn
moved disable call to startUpload so it isn't overwritten on inherit
Merge pull request #1022 from dimagi/dim_img_upload_btn

disabled upload button when upload starts
i18n
Merge pull request #1119 from dimagi/trans

i18n
merge with master