Merge origin/caltest into caltest

Conflicts:
	nbproject/project.properties