Socks Proxy Support

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   framework/http/proxy/proxy.py
	modified:   owtf.py
Merge pull request #117 from marioskourtesis/master

Socks Proxy Support added to OWTF Inbound Proxy. Thanks to Marios Kourtesis