Some work on Mesh
Merge branch 'develop' of github.com:paperManu/splash into develop

Conflicts:
	src/mesh.cpp