second commit
Merge branch 'develop' of https://github.com/dimitrisre/panosTesting into develop

Conflicts:
	test.c