Fixing netman tests
Fixing netman tests
Merge branch 'master' of https://github.com/spaceconcordia/space-netman

Conflicts:
	tests/gtest/Makefile