Merge origin/master

Conflicts:
	nbproject/project.properties
Merge origin/master