Commit before pull
Merge branch 'master' of https://github.com/wolfgangimig/byps.git

Conflicts:
	java/bypshttp/src/byps/http/client/jcnn/JcnnClientFactory.java
	java/bypshttpasf/src/byps/http/client/asf/AsfClientFactory.java