Modify

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

Conflicts:
	PAFTestPlatform/src/com/paftp/entity/ApplySut.java
	PAFTestPlatform/src/com/paftp/entity/Role.java