Merge branch 'juliofcgi' of https://github.com/julitopower/DisplayCluster into juliofcgi

Conflicts:
	tests/fcgiws/ResponseTests.cpp