Modify
Merge branch 'master' of https://github.com/PAFTF/paftp

Conflicts:
	PAFTestPlatform/WebRoot/duan.jsp
Modify
Merge branch 'master' of https://github.com/PAFTF/paftp
Modify
Add
Merge branch 'master' of https://github.com/PAFTF/paftp
Merge branch 'master' of https://github.com/PAFTF/paftp
Modify
Merge branch 'master' of https://github.com/PAFTF/paftp
Merge branch 'master' of https://github.com/PAFTF/paftp
Modify