Update to reflect changes in the core library
Merge branch 'master' of https://github.com/workshare/ms-nos-proxy

Conflicts:
	src/test/java/com/msnos/proxy/filter/AdminFilterTest.java
	src/test/java/com/msnos/proxy/filter/HttpProxyFilterTest.java
	src/test/java/com/msnos/proxy/filter/HttpRouterTest.java