~ minor bug fixes
Merge branch 'master' into config

Conflicts:
	build/classes/docz/AddDialog.form
	build/classes/docz/DocZMainFrame.form
	nbproject/private/private.xml