Merge origin/master

Conflicts:
	.gitignore
	nbproject/project.properties
	nbproject/project.xml