minor
Merge branch 'develop' of https://github.com/banterle/piccante into develop

Conflicts:
	samples/simple_triangulation/main.cpp