fix content attachment issue
Merge branch '3.0' of https://github.com/goagent/goagent into 3.0

Conflicts:
	local/proxy.py
merge fix
Update proxy.py
fix gtk resize issue
Merge pull request #135 from binyuj/fixgtk

fix gtk resize issue
make pylint happy
update swithy to 1.10.1
purge switchy
update switchy
add supervisor.conf
add adblock feature to proxy.pac
add newsmth adblock rule
add weibo adblock rule
cache adblock response
add baidu ablock rule
add tanx ablock rule
add 163 adblock rule
Update proxy.pac
Update proxy.pac