adding more changes and small improvements to camera, and head...
resolve merge conflicts with origin/master
Merge branch 'master' of https://github.com/worklist/hifi