Alterações em sala de aula no web
Merge branch 'master' of https://github.com/theusindabike/restaurante

Conflicts:
	RestauranteWeb/nbproject/private/private.properties
	RestauranteWeb/nbproject/project.properties