Hacked in the camera capture stuff
Merge remote-tracking branch 'origin/master'