alteração 17 05 2014
Merge branch 'master' of https://github.com/ze12augusto/EvolutionMedicWeb

Conflicts:
	EvolutionMedicE-ejb/build/classes/br/com/si5/evolutionmedic/ejb/FraseEJB.class
	EvolutionMedicE-ejb/dist/EvolutionMedicE-ejb.jar
	EvolutionMedicE-ejb/src/java/br/com/si5/evolutionmedic/ejb/AvaliacaoEJB.java
	EvolutionMedicE-ejb/src/java/br/com/si5/evolutionmedic/ejb/FraseEJB.java
	EvolutionMedicE-war/build/web/WEB-INF/classes/br/com/si5/evolutionmedic/managerBean/AvaliacaoMB.class
	EvolutionMedicE-war/build/web/WEB-INF/classes/br/com/si5/evolutionmedic/managerBean/FraseMB.class
	EvolutionMedicE-war/build/web/avaliacao.xhtml
	EvolutionMedicE-war/build/web/extra.xhtml
	EvolutionMedicE-war/build/web/formulario.xhtml
	EvolutionMedicE-war/build/web/formulario_1.xhtml
	EvolutionMedicE-war/build/web/frase.xhtml
	EvolutionMedicE-war/build/web/images/icons/media/record.png
	EvolutionMedicE-war/build/web/images/icons/misc/home.png
	EvolutionMedicE-war/build/web/images/icons/tools/pencil - Copia.png
	EvolutionMedicE-war/build/web/images/icons/tools/pencil.png
	EvolutionMedicE-war/build/web/images/misc/deploy-nav - Copia.png
	EvolutionMedicE-war/build/web/images/misc/deploy-nav2.png
	EvolutionMedicE-war/build/web/images/misc/logo-evolution.png
	EvolutionMedicE-war/build/web/images/misc/logo-evolutionMedic.png
	EvolutionMedicE-war/build/web/images/status.gif
	EvolutionMedicE-war/build/web/index.xhtml
	EvolutionMedicE-war/build/web/isolado.xhtml
	EvolutionMedicE-war/build/web/styles/framework.css
	EvolutionMedicE-war/build/web/styles/style.css
	EvolutionMedicE-war/dist/EvolutionMedicE-war.war
	EvolutionMedicE-war/nbproject/private/private.properties
	EvolutionMedicE-war/nbproject/private/private.xml
	EvolutionMedicE-war/src/java/br/com/si5/evolutionmedic/managerBean/AvaliacaoMB.java
	EvolutionMedicE-war/src/java/br/com/si5/evolutionmedic/managerBean/FraseMB.java
	EvolutionMedicE-war/web/avaliacao.xhtml
	EvolutionMedicE-war/web/extra.xhtml
	EvolutionMedicE-war/web/formulario.xhtml
	EvolutionMedicE-war/web/formulario_1.xhtml
	EvolutionMedicE-war/web/frase.xhtml
	EvolutionMedicE-war/web/images/icons/media/record.png
	EvolutionMedicE-war/web/images/icons/misc/home.png
	EvolutionMedicE-war/web/images/icons/tools/pencil - Copia.png
	EvolutionMedicE-war/web/images/icons/tools/pencil.png
	EvolutionMedicE-war/web/images/misc/deploy-nav - Copia.png
	EvolutionMedicE-war/web/images/misc/deploy-nav2.png
	EvolutionMedicE-war/web/images/misc/logo-evolution.png
	EvolutionMedicE-war/web/images/misc/logo-evolutionMedic.png
	EvolutionMedicE-war/web/images/status.gif
	EvolutionMedicE-war/web/index.xhtml
	EvolutionMedicE-war/web/isolado.xhtml
	EvolutionMedicE-war/web/styles/framework.css
	EvolutionMedicE-war/web/styles/style.css
	build/EvolutionMedicE-ejb.jar
	build/EvolutionMedicE-war.war
	dist/EvolutionMedicE.ear
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-ejb_jar/br/com/si5/evolutionmedic/ejb/FraseEJB.class
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/WEB-INF/classes/br/com/si5/evolutionmedic/managerBean/AvaliacaoMB.class
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/WEB-INF/classes/br/com/si5/evolutionmedic/managerBean/FraseMB.class
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/avaliacao.xhtml
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/extra.xhtml
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/formulario.xhtml
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/frase.xhtml
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/icons/media/record.png
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/icons/misc/home.png
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/icons/tools/pencil - Copia.png
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/icons/tools/pencil.png
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/misc/deploy-nav - Copia.png
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/misc/deploy-nav2.png
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/misc/logo-evolution.png
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/misc/logo-evolutionMedic.png
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/images/status.gif
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/index.xhtml
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/isolado.xhtml
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/styles/framework.css
	dist/gfdeploy/EvolutionMedicE/EvolutionMedicE-war_war/styles/style.css