Merge origin/master

Conflicts:
	nbproject/private/private.xml
Merge origin/master

Conflicts:
	nbproject/private/private.xml
Merge origin/master
Merge origin/master

Conflicts:
	nbproject/private/private.xml