Work on GUI/Camera
Merge branch 'GUI/Camera'