fix
Merge branch 'PicTransferServer'