Merge branch 'skip_frames'
Merge branch 'master' of https://github.com/caa-project/caa-camera
websocket version