Merge branch 'scholli-build' into scholli-merge

Conflicts:
	cmake/modules/FindBullet.cmake
	include/gua/renderer/GeometryRessource.hpp
	include/gua/renderer/NURBSRessource.hpp
	include/gua/renderer/Pipeline.hpp
	include/gua/renderer/TriMeshRessource.hpp
	include/gua/renderer/Video3DRessource.hpp
	include/gua/renderer/Video3DUberShader.hpp
	include/gua/renderer/Volume.hpp
	src/gua/renderer/NURBSRessource.cpp
	src/gua/renderer/TriMeshRessource.cpp
	src/gua/renderer/Video3DLoader.cpp
	src/gua/renderer/Video3DRessource.cpp
	src/gua/renderer/Video3DUberShader.cpp
	src/gua/scenegraph/Video3DNode.cpp
Change get_ubershader to create_ubershader.
Merge branch 'develop' of https://github.com/scholli/guacamole into scholli-merge

Conflicts:
	cmake/modules/FindBullet.cmake
	include/gua/renderer/TriMeshRessource.hpp
	include/gua/renderer/Video3DRessource.hpp
	include/gua/renderer/Video3DUberShader.hpp
	include/gua/renderer/Volume.hpp
	src/gua/renderer/NURBSRessource.cpp
	src/gua/renderer/Video3DLoader.cpp
	src/gua/renderer/Video3DRessource.cpp
	src/gua/renderer/Video3DUberShader.cpp
	src/gua/scenegraph/Video3DNode.cpp
Add version defines to config.hpp.in.
Use cmakes option command instead of set.
Make protobuf optional.
Improve config.hpp generation.
Add GUACAMOLE_EXAMPLES option.
Add CMakeLists.txt for examples.
Merge branch 'scholli-merge' into develop
Version bump.
Merge branch 'release/v0.8.1' into develop
Fix bug in find_protobuf.cmake.
Version bump.
Merge branch 'release/v0.8.2' into develop
Add multicontext example.
Change to OpenGL 4.3.
Version bump.
Merge branch 'release/v0.8.3' into develop
bugfix for trimeshubershader instantiation