add FORBID and WEB pac target;add comp.py
Merge remote-tracking branch 'upstream/master' into win

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

	modified:   local/misc/proxy.pac
	modified:   local/proxy.ini
	modified:   local/src.zip/make_config.py
	deleted:    server/python/README.txt
	modified:   server/python/app.yaml
	new file:   server/python/comp.py
	modified:   server/uploader.zip