Finally almost done
Merge remote-tracking branch 'origin/master'

Conflicts:
	MeshCorrespondence/MeshCorrespondence/MeshViewer.cc