smaller changes
Merge branch 'master' of https://github.com/rychvald/Security
Merge branch 'master' of https://github.com/rychvald/Security

Conflicts:
	HTTPProxyCache/HTTPProxy.pyc