few changes
Merge branch 'master' of github.com:OoDeLally/heitz_p-jaouan_f-synt

Conflicts:
	src/scene.cpp