Merge origin/master

Conflicts:
	nbproject/project.xml
Merge origin/master