Fixed enable/disable of file upload buttons .
Merge remote-tracking branch 'origin/master'