'201303020906'
Merge branch '2.0' of https://github.com/goagent/goagent into 2.0

Conflicts:
	local/proxy.ini
	local/proxy.pac
Merge branch '2.0' of https://github.com/xkxf1293/goagent into 2.0

Conflicts:
	local/proxy.ini
	local/proxy.pac