Merge origin/master

Conflicts:
	nbproject/project.properties
	src/db_managment/Direct_Control_BD.java
	src/joe/EditorDeCeldaNumeros.java
	src/joe/VentanaDeInicio.java
	src/sql_files/verPrecioPorCodigo.sql