Merge origin/master

Conflicts:
	nbproject/project.propertieshhjj
Merge origin/master

Conflicts:
	nbproject/project.propertieshhjj