stop camera
Merge branch 'origin/master'