working sending files
some cleaning
Merge branch 'sending-files' into server-development