Merge branch 'release-proto1'
Incorporated the camera view.
Merge branch 'master' into develop