Merge origin/master

Conflicts:
	FaceChef/src/main/java/Registro.java
	FaceChef/src/main/webapp/perfil.xhtml