Latest changes for Testing
Merge branch 'master' of https://github.com/spaceconcordia/HE100-lib

Conflicts:
	C/test_netman/Makefile
Merge branch 'master' of https://github.com/spaceconcordia/HE100-lib

Conflicts:
	C/Makefile
	C/src/SC_he100.c