ssr added to dof pass
Merge branch 'master' of https://github.com/GuidoSchmidt/trinitytech

Conflicts:
	assets/scenes/blend/sibenik-cathedral.blend
	assets/shader/compositing/compositing.frag.glsl
	assets/shader/dof/dof.frag.glsl
	assets/shader/gbuffer/gbuffer.frag.glsl
	src/Renderer.cpp
Merge branch 'master' of https://github.com/GuidoSchmidt/trinitytech

Conflicts:
	src/Renderer.cpp
changed sublime project files