add FORBID and WEB pac target;add comp.py
add third proxy support in proxy.ini for 8086 mode
v2.1.15; fix '404 not found' bug; add PAGE target:
if 'local\misc\page.html' is missing, return empty response,
else format its content with some values and return it.
bugfix in dumping string to js
-
Merge remote-tracking branch 'upstream/master'

Conflicts:
	local/misc/proxy.pac
	local/src.zip/make_config.py
	local/src.zip/plugins.py
	server/python/app.yaml

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