Merge branch '1.6' into 1.7

Conflicts:
	proxy/pom.xml
tree: e97a86c0d9f5ba51a5e0cfc9524d64d36801ba9e
  1. examples/
  2. src/
  3. .gitignore
  4. pom.xml
  5. proxy.properties
  6. README