change for register
Merge branch 'master' of https://github.com/PAFTF/paftp

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