previous version at home
Merge origin/master

Conflicts:
	src/java/control/ControlAcceso.java
	src/java/service/ConexionDB.java
	src/java/service/ServicioLibro.java
	src/java/service/ServicioUsuario.java
	web/index.html
Conflicts resolve
Hasta el detalle