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

Conflicts:
	PAFTestPlatform/src/com/paftp/service/StaticColumn/impl/ApplySutStatusImpl.java