login funcionando
resolviendo conflictos
resolviendo conflictos 2
Merge branch 'master' of https://github.com/manuel14/dacs2014

Conflicts:
	mavenproject1/mavenproject1-web/src/main/java/managedBeans/LogoutMb.java
	mavenproject1/mavenproject1-web/src/main/webapp/WEB-INF/templates/plantillaPrincipal.xhtml
	mavenproject1/mavenproject1-web/src/main/webapp/WEB-INF/web.xml