merge develop and fixed conflicts

.gitignore

.gitlab-ci.yml

.gitmodules

CMakeLists.txt

config/Libraries.cmake

config/Sources.cmake

config/ext/IncludeShader.cmake

config/lib/vma/vma.cpp

include/vkcv/Context.hpp

include/vkcv/Core.hpp

include/vkcv/DescriptorConfig.hpp

include/vkcv/DescriptorWrites.hpp

include/vkcv/DrawcallRecording.hpp

include/vkcv/Event.hpp

include/vkcv/File.hpp

include/vkcv/QueueManager.hpp

include/vkcv/ShaderStage.hpp

lib/VulkanMemoryAllocator-Hpp

modules/CMakeLists.txt

modules/camera/config/GLM.cmake