resolve conflict GUI
Merge branch 'master' of https://github.com/legarlin/MeshGit

Conflicts:
	MeshGit.mel
	MeshGit.mll
	MeshGitNode.cpp
	MeshOperator.h