introduce net2
refine rule for internat
refine withphp rule
Merge remote-tracking branch 'refs/remotes/goagent/3.0'

Conflicts:
	local/proxy.py