Merge origin/master

Conflicts:
	test/calogerusdraconis/UserDragonTest.java