Merge the 'camera-view' branch

To work efficiently on the application, we need to merge in the 'camera-view' branch.