Refactor CameraVC and Camera
Merge branch 'picture' into develop

Feature is succesfully implemented and therefore merged to develop.