local
local
Merge branch '3.0' of https://code.google.com/id/cCOYjcH6krM into 3.0

Conflicts:
	server/php/app.yaml
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0

Conflicts:
	local/proxy.bat
	local/proxy.pac
	server/python/wsgi.py
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0