final cleanup
Merge branch 'PicTransferServer'