Merge branch 'develop' into mmcifparser

modules/gfx/pymod/export_gfx_obj.cc

modules/gfx/pymod/export_gradient.cc

modules/gfx/pymod/export_primitives.cc

modules/gfx/pymod/export_primlist.cc

modules/gfx/pymod/export_scene.cc

modules/gfx/pymod/py_gfx_obj.py

modules/gfx/pymod/wrap_gfx.cc

modules/gfx/src/CMakeLists.txt

modules/gfx/src/collada_exporter.cc

modules/gfx/src/collada_exporter.hh

modules/gfx/src/color.cc

modules/gfx/src/color.hh

modules/gfx/src/entity.cc

modules/gfx/src/entity.hh

modules/gfx/src/exporter.hh

modules/gfx/src/exporter_fw.hh

modules/gfx/src/gfx_node.cc

modules/gfx/src/gfx_node.hh

modules/gfx/src/gfx_object.cc

modules/gfx/src/gfx_object.hh