inactive symbol, proxy setup dialog moved
Merge branch 'master' of github.com:downloadam/client
images
Merge branch 'master' of github.com:downloadam/client

Conflicts:
	client/settings.py
fix
Merge branch 'master' of github.com:downloadam/client

Conflicts:
	client/plugins/ui/systray/win.py
Merge branch 'master' of github.com:downloadam/client