-
crud usuario adm e atualizacao conteudo do site
Merge branch 'master' of
https://github.com/RaymondCavallaro/TrabalhoJava

Conflicts:
	Am_Device/src/main/WebContent/WEB-INF/faces-config.xml
	Am_Device/src/main/WebContent/administrativa.xhtml
	Am_Device/src/main/WebContent/login.xhtml
	Am_Device/src/main/WebContent/template/cabecalho.xhtml
	Am_Device/src/main/java/br/com/am/device/dao/ClienteDao.java
	Am_Device/src/main/java/br/com/am/device/dao/UsuarioDao.java