Ajustes
Merge
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	nbproject/private/private.properties