Updated camera manager
Merge branch 'master' of https://github.com/wujigrid/xin