added support for capture network traffic
Merge branch 'master' of https://github.com/jcocampo/sqeTemp

Conflicts:
	test-nbccom/main/src/test/resources/testng.xml