Renanme dhmodule
Merge branch 'master' of https://github.com/Fdepraetre/PinokioProject
Update cameraControl
Merge branch 'master' of https://github.com/Fdepraetre/PinokioProject

Conflicts:
	src/control/cameraControl.py
Correct import