ui validation for update
resolved conflicts
upload validation
Merge remote-tracking branch 'origin/master'
validation messages for  upload
Merge remote-tracking branch 'origin/master'