some fixes related with jpeg uploading
and also some trashes too
Merge remote-tracking branch 'origin/master'