Merge origin/master

Conflicts:
	src/java/Controlador/AgregaCatalogo.java