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
Merge remote-tracking branch 'goagent/3.0'

Conflicts:
	local/proxy.ini