update private.xml
Merge branch 'master'

Conflicts:
	nbproject/private/private.xml