Merge origin/master

Conflicts:
	AirHockey/nbproject/project.properties