Bugfix for #30
Merge branch 'feature/task-version_1.2-CGAL_Arrangement' of https://github.com/oliviertournaire/QLabelling into feature/task-version_1.2-CGAL_Arrangement

Conflicts:
	demo/Arrangement_on_surface_2/qt/ArrangementDemoWindow.cpp