Merge remote-tracking branch 'origin/new_development' into new_development

Conflicts:
	nbproject/private/private.xml