Merge origin/master

Conflicts:
	src/calogerusdraconis/XmlController.java