Merge branch 'master' into feature/web-service/vanillaClient

CMakeLists.txt

applications/ftl2mkv/src/main.cpp

applications/gui/src/camera.cpp

applications/gui/src/camera.hpp

applications/gui/src/config_window.cpp

applications/gui/src/config_window.hpp

applications/gui/src/ctrl_window.cpp

applications/gui/src/main.cpp

applications/gui/src/media_panel.cpp

applications/gui/src/media_panel.hpp

applications/gui/src/screen.cpp

applications/gui/src/screen.hpp

applications/gui/src/src_window.cpp

applications/gui/src/src_window.hpp

applications/merger/CMakeLists.txt

applications/merger/src/main.cpp

applications/reconstruct/CMakeLists.txt

applications/reconstruct/src/main.cpp

applications/reconstruct/src/reconstruction.cpp

applications/reconstruct/src/reconstruction.hpp