new video3d functionality, network support via zmq
user name test
resolved conflicts
minimal changes
Merge branch 'develop' of https://github.com/steppobeck/guacamole into develop

Conflicts:
	src/gua/renderer/GBufferPass.cpp