Recalibrated a camera
Commented out HDR option temporarily
Merge remote-tracking branch 'upstream/master'