private
Merge remote-tracking branch 'origin/master'

Conflicts:
	SLIT/nbproject/private/private.xml