Merge origin/master

Conflicts:
	.gitignore
	lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
	lib/nblibraries.properties
	nbproject/project.properties