Impl. do Cadastro de Dietas #5
Merge branch 'master' of https://github.com/arthurUFRPE/es-software-nutricional

Conflicts:
	Sistema Nutricional/src/gui/CadastroDietas.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sistema Nutricional/src/META-INF/persistence.xml
	Sistema Nutricional/src/gui/CadastroDietas.java