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

Conflicts:
	PAFTestPlatform/resources/struts.xml