Added
Test

Test
g
Merge branch 'master' of https://github.com/Conundris/Ultramail

Conflicts:
	UltraMail/UltraMail/build/built-jar.properties
	UltraMail/UltraMail/build/nb-jfx.jks
	UltraMail/UltraMail/dist/UltraMail.html
	UltraMail/UltraMail/dist/UltraMail.jnlp
	UltraMail/UltraMail/nbproject/private/private.properties
	UltraMail/UltraMail/nbproject/private/private.xml

	UltraMail/UltraMail/src/com/liko4productions/ultraseries/ultramail/UltraMailGUIController.java