Merged nbproject/project.properties