Merge branch 'develop' into feature-network

Conflicts:
	CMakeLists.txt
	include/Trillek.h
	src/main.cpp
	tests/CMakeLists.txt
	tests/main.cpp
Switch to develop branch of NetPort