Merge origin/master

Conflicts:
	upsTest_1/nbproject/private/private.properties
	upsTest_1/nbproject/project.properties