Merge origin/master

Conflicts:
	nbproject/project.properties
	src/Conexionbd/agregar.java
	src/Logica/Categoria.java
	src/Logica/ControladorCategoria.java
	src/Logica/Hoja.java