WPP-70: Adding timeout(connection and socket) to the HttpClients created for WebProxy
- Changing single comment lines to multiple
Merge branch 'WPP-70' of github.com:shawnconnolly/WebproxyPortlet into shawnconnolly-WPP-70

Conflicts:
	src/main/webapp/WEB-INF/portlet.xml
Merge branch 'WPP-70' of github.com:shawnconnolly/WebproxyPortlet into shawnconnolly-WPP-70

Conflicts:
	src/main/webapp/WEB-INF/portlet.xml
Merge branch 'shawnconnolly-WPP-70' into v2