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

Conflicts:
	PAFTestPlatform/src/com/paftp/action/RoleAction.java