up
Merge branch 'master' of https://github.com/xiaojunhan/filetransnew.git

Conflicts:
	src/com/david4/filetrans/util/SFTPUtil.java
add