Merge origin/master

Conflicts:
	Campus/nbproject/project.properties