latest commits
Merge branch 'master' of https://github.com/GuidoSchmidt/trinitytech

Conflicts:
	project/msvc/Debug/CL.read.1.tlog
	project/msvc/Debug/CL.write.1.tlog
	project/msvc/Debug/Context.obj
	project/msvc/Debug/Renderer.obj
	project/msvc/Debug/main.obj
	project/msvc/Debug/vc110.idb
	project/msvc/Debug/vc110.pdb
	project/msvc/TechDemo.sdf
	project/msvc/TechDemo.v11.suo
changed working directory to root
G-Buffer and Compo-FBO are setup, should work