stop tracking netbeans propertie files
Merge commit '62b826f061817479b7eca155747955bd170a40a1'

Conflicts:
	nbproject/project.properties