* 'master' of /home/jund/CGoGN:
  adding mergeFaces on map3
  Resolving bug in MarkerForTraversor and compilation pb for importMoka and exportPov
  import Tet : option to invert, correction of mergeFace gmap2, removing extra createHexa in polyhedron3D
  removing unnecessary check() in subdivision3
  correcting embedding error for edge orbit on splitFace on 3gmap, replacing name functions in gmap1 to use cycle
  using traversor for exportPov, correction of volumic function (slicing and subdivision)
  small modification function sliceConvexVolumes
  problem on polyhedronView
  starting import function for Moka and improving export for povray
  adding slicing function for volume and conversion hexahedrongrid to tetrahedron mesh
  add export obj, function to slice a volume with a plane, extrusion of surfaces to volumes from lionel

* 'master' of /home/vanhoey/CGoGN:
  update on import/export of ply data

* 'master' of /home/untereiner/CGoGN:
  volumetric decimation again
  begin of the volumetric decimation return
  adding multiresolution branch in algorithm directory
  add multiresolution progressive meshes add cut plan to tuto_oper3

add marking/getting cells corresponding to a column of histo or quantiles

colorMap cleaning
moving qtinputs.cpp in right place (warning cmake needed)

mysterious bug of setFocus(Qt::MouseFocusReason)

add cut plan to tuto_oper3

add buttons parameter in popup

import Tet : option to invert, correction of mergeFace gmap2, removing extra createHexa in polyhedron3D

Conflicts:
	Apps/Examples/viewer.cpp

Conflicts:
	Apps/Examples/viewer.cpp
	src/Topology/map/map2MR/map2MR_PM.cpp

Conflicts:
	src/Algo/Import/ply.c

BUG FIX on exit is call on SimpleQt out not on GLWidget