Merge origin/Trunk into Trunk

Conflicts:
	nbproject/project.properties