no message
Merge branch 'thierry_working'

Conflicts:
	Camera.cpp
	Scene.cpp