Merge remote-tracking branch 'origin/master'
 .
Merge branch 'master' of https://github.com/lenxyang/sandbox
 camera