++ get file via java.net.Socket form own tomcat server
Merge remote-tracking branch 'origin/master'