rm inflater
Merge branch 'master' of git@github.com:xmxsuperstar/apn-proxy.git

Conflicts:
	src/main/java/test/HttpSnoopClientInitializer.java