started on sensorCam
Merge remote-tracking branch 'bart/master'

Conflicts:
	templateModule/aim/inc/templateModule.h