Merge master into device_verification and fix conflicts

CMakeLists.txt

include/mtx/events.hpp

include/mtx/events/collections.hpp

include/mtx/events/common.hpp

include/mtx/events/encrypted.hpp

include/mtx/events/messages/audio.hpp

include/mtx/events/messages/emote.hpp

include/mtx/events/messages/file.hpp

include/mtx/events/messages/image.hpp

include/mtx/events/messages/notice.hpp

include/mtx/events/messages/text.hpp

include/mtx/events/messages/video.hpp

include/mtx/events/reaction.hpp

include/mtx/identifiers.hpp

include/mtx/log.hpp

include/mtx/pushrules.hpp

include/mtx/responses/login.hpp

include/mtx/user_interactive.hpp

include/mtxclient/http/client.hpp

lib/http/client.cpp