Merge branch 'develop' into feature_quickmod

Conflicts:
	CMakeLists.txt
	MultiMC.cpp
	MultiMC.h
	depends/launcher/org/multimc/onesix/OneSixLauncher.java
	gui/MainWindow.cpp
	gui/MainWindow.ui
	gui/dialogs/OneSixModEditDialog.cpp
	gui/dialogs/OneSixModEditDialog.ui
	gui/groupview/InstanceDelegate.cpp
	gui/pages/VersionPage.h
	logic/BaseInstance.h
	logic/BaseInstance_p.h
	logic/LegacyInstance.cpp
	logic/LegacyInstance.h
	logic/MMCJson.cpp
	logic/NostalgiaInstance.cpp
	logic/OneSixInstance.cpp
	logic/OneSixInstance.h
	logic/OneSixUpdate.cpp
	logic/OneSixUpdate.h
	logic/OneSixVersionBuilder.cpp
	logic/VersionFile.h
	logic/VersionFinal.cpp
	logic/minecraft/InstanceVersion.h
	logic/minecraft/VersionFile.cpp