Merge branch 'develop' of icube-forge.unistra.fr:cgogn/cgogn into develop
Conflicts: CGoGN/src/Utils/Shaders/shaderPhong.cpp CGoGN/src/Utils/Shaders/shaderSimpleFlat.cpp
Conflicts: CGoGN/src/Utils/Shaders/shaderPhong.cpp CGoGN/src/Utils/Shaders/shaderSimpleFlat.cpp