Merge origin/master

Conflicts:
	individual.h
	nbproject/configurations.xml