Merge origin/master

Conflicts:
	build/classes/accesodom/frmaccesoDOM.class
	nbproject/private/private.xml