Merge master into NewGUI and resolve conflicts.

Conflicts:
	MCU-API/src/org/smbarbour/mcu/util/HTTPSUtils.java
	MCU-API/src/org/smbarbour/mcu/util/MCUpdater.java
	MCU-API/src/org/smbarbour/mcu/util/ServerPackParser.java
	MCU-ServerUtility/src/org/smbarbour/mcu/ServerForm.java
	mcu/src/org/smbarbour/mcu/Main.java
	version.xml