Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/project.properties
	web/css/estilo.css