Merge origin/master

Conflicts:
	nb-configuration.xml
	pom.xml