bugfixes in gbufferpass::draw_rays() and node::set_dirty()
fixed merge-bug
Merge branch 'develop' of https://github.com/vrsys/guacamole into develop

Conflicts:
	src/gua/renderer/GBufferPass.cpp
	src/gua/scenegraph/Node.cpp
Fixed merge bug for bbox_draw
Merge pull request #34 from scholli/develop

Develop