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

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
Merge branch 'master' of https://github.com/liangrockman/SensitiveInfoFilter into liangrockman-master

Conflicts:
	src/main/java/org/apache/http/examples/client/ClientConnectionRelease.java
none
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml