Modify

Signed-off-by: Vincent-Chou <sicong_zhou@163.com>
Merge branch 'master' of https://github.com/PAFTF/paftp

Conflicts:
	PAFTestPlatform/src/com/paftp/action/ApplySutAction.java
Merge branch 'master' of https://github.com/PAFTF/paftp
Modify

Signed-off-by: Vincent-Chou <sicong_zhou@163.com>
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

Conflicts:
	PAFTestPlatform/src/com/paftp/entity/ApplySutStatus.java