Merge origin/master

Conflicts:
	src/my/contacteditor/ContactEditorUI.java