update
Merge branch 'master' of github.com:mikeowens/gintana

Conflicts:
	src/test/network/CMakeLists.txt
	src/test/service/CMakeLists.txt