Merge commit '80cf946c709722568bba9931160ea64e7079e3f4' into max

Conflicts Resolve:
	nbproject/private/private.properties