Merge branch 'develop' into quickmod

Conflicts:
	CMakeLists.txt
	MultiMC.cpp
	MultiMC.h
	depends/settings/CMakeLists.txt
	depends/util/CMakeLists.txt
	logic/lists/InstanceList.cpp
	logic/lists/InstanceList.h
	main.cpp
	tests/CMakeLists.txt
Fix unit tests