Merge origin/master

Conflicts:
	Nutricao/nbproject/project.properties
Merge origin/master