Merge origin/master

Conflicts:
	XML_test_writing.xml
	src/lightningRoundDisplayPanel.java