Merge origin/master

Conflicts:
	README.md
	nbproject/private/private.xml