Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java