* 'master' of /home/vanhoey/CGoGN:
  correction : export frame dans exportPlyPTMgeneric
  correction petit bug dans export
  update of import/exportPlyPTM for generic and fittingerror support
  update of importPlyPTMgeneric : support any format having pos+frame+functions+residual
  Modification de la classe MapRender pour avoir accès facilement au champs m_indexBuffers et m_nbIndices

assert execute uniquement si cmake -DASSERTON=true

Ajout du define TOPO_MAP dans EmbededMap
Petite modif dans importTet

Conflicts:
	Apps/Examples/frame_manip.cpp

remove vbo unbinding in shader (was only called when VBO was destructed,
shader is then invalid or destructed just after)

=> remove the bug of Drawer delete

Conflicts:
	src/Topology/map/map3.cpp

Conflicts:
	src/Utils/Shaders/shaderPhong.cpp

* 'master' of /home/thery/CGoGN:
  Add 2D manipulation on frames
  pickables: bug sphere rendering & IsoSphere creation with param <3

Gestion du et/ou clipping, et ajout de l'option dans l'interface Qt de stage_shader.

* 'master' of /home/vanhoey/CGoGN:
  qqs modifs :-)
  added new dependency to package uuid-dev in README
  added howto (in README_ECLIPSE) install CMake Editor in Eclipse
  corrections dans AHEM : _CELL et _ORBIT
  added tests to vector_gen and updated frame
  new naming convention for frames : XYZ instead of TBN
  rename localFrame -> Frame ; move from Utils to Geom namespace
  localFrame.hpp : handling cross product of orthogonal vectors
  Euler angle name conventions used in localFrame
  updated comment for localFrame

Add pickable object for interface (try frame_manip example)
Add frame manipulator
Add GL matrices access from static GLSLShader

Inclusion du code du shader dans clippingShader. Implémentation de toutes les fonctions relatives au clipping par sphères.