Merge origin/master

Conflicts:
	nbproject/private/private.xml